From ad2d8d408625382460ee4c1280e72f9a9d1552be Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Fri, 28 Dec 2018 22:42:40 -0500 Subject: [PATCH] updated da site yo --- Dockerfile | 2 +- src/index.php | 6 +++--- src/main.js | 45 ++++++-------------------------------------- src/style.css | 9 ++++++--- src/twitch-player.js | 10 ---------- 5 files changed, 16 insertions(+), 56 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3d37dbf..672948b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # wyattjmiller.com Dockerfile -# Created by Wyatt J. Miller, published by Entourage Solutions +# Created by Wyatt J. Miller, published by Miller Web Solutions # Licensed by the MIT # # Copying files in the dockerfile is kind of a mess. Actually not really. diff --git a/src/index.php b/src/index.php index 11a7a27..adc342f 100644 --- a/src/index.php +++ b/src/index.php @@ -17,9 +17,9 @@
-

Hello there!

-

I am a web designer, a programmer, a gamer, but most importantly, I am a go-getter.


-

There's nothing much here on the home page but if you click or tap on the buttons below my name, you can view all sorts of things about yours truly. Go explore!

+

Hello there, people!

+

I write code. I do nothing special.


+

There's nothing much here except my latest project that I worked on. It's a GitHub client tool for viewing repositories once a user is searched.

diff --git a/src/main.js b/src/main.js index 8d833a5..8d2437a 100644 --- a/src/main.js +++ b/src/main.js @@ -26,49 +26,16 @@ function mediaDetect(){ } } -function whatTimeIsIt(){ - var death = new Date(); - var timezone = death.getTimezoneOffset(); - var getHoursOffset; - var getMinutesOffset; - var getSecondsOffset; - - if (navigator.geolocation) { - navigator.geolocation.getCurrentPosition(); - } else { - print("Geolocation is not supported. Update your shit."); - } - - // working on getting user location and setting timezone to said location - function timezoneOffset(zone){ - var offset = Math.abs(zone/60); - - var getHoursOffset = death.getHours + offset; - var getMinutesOffset = death.getMinutes + offset; - var getSecondsOffset = death.getSeconds + offset; - - return getHoursOffset, getMinutesOffset, getSecondsOffset; - } - - function isPastNoon(){ - if (death.getHours() > 12) { - print(death.getHours() - 12); - } else { - print(death.getHours()); - } - } - - //timezoneOffset(timezone); - console.log(timezone); - print(isPastNoon(), ":", death.getMinutes(), ":", death.getSeconds()); - print(isPastNoon(), getHoursOffset(), getMinutesOffset(), getSecondsOffset()); - +function whatTimeIsIt() { + console.log(Intl.DateTimeFormat().resolvedOptions().timeZone); } - function backToTop(){ // code goes here // this function has a button where js moves the page/screen back to the top } //mediaDetect(); -//whatTimeIsIt(); +var time = document.getElementById("load"); +time.addEventListener("load", whatTimeIsIt, false); + +whatTimeIsIt(); diff --git a/src/style.css b/src/style.css index 8458197..f4727d0 100644 --- a/src/style.css +++ b/src/style.css @@ -17,7 +17,7 @@ a:hover {color: seashell !important;} .header-title {color: whitesmoke;} .header-title h1 {font-family: "Pacifico", cursive; font-size: 72px; text-align: center; margin: 0; padding: 35px;} -.footer {font-family: "Oswald", sans-serif; background-color: #4c4e51; padding: 20px;} +.footer {font-family: "Oswald", sans-serif; background-color: #4c4e51; padding: 20px; position: sticky; width: 100%; bottom: 0;} .footer p {font-size: 20px; color: white; text-align: center; padding: 5px;} .footer a {color: white; text-decoration-color: white; text-decoration-line: none;} .footer a:hover {color: white;} @@ -26,6 +26,9 @@ a:hover {color: seashell !important;} .main-background {border-radius: 25px; padding: 25px;} .main-background h2 {font-family: "Kavivanar", cursive; position: relative; font-size: 54px; color: white; text-align: center;} .main-background p {font-family: "Kavivanar", cursive; position: relative; font-size: 36px; color: white; text-align: center;} +.main-background-text a { + color: #ff9999 !important; +} .about-background h2 {position: relative; font-size: 24px; color: white;} .about-background p {position: relative; font-size: 20px; color: white;} @@ -39,12 +42,12 @@ a.nav-item.nav-link {font-family: "Oswald", cursive; font-size: 30px;} /*Media queries*/ @media (min-width: 768px){ .main-section {padding: 50px 10px;} - .main-section h2 {text-align: left;} + } @media (min-width: 992px){ .main-section {padding: 70px 10px;} } @media (min-width: 1200px){ - .main-section {padding: 90px 200px;} + .main-section {padding: 124px 200px;} .main-section h2 {text-align: center;} } \ No newline at end of file diff --git a/src/twitch-player.js b/src/twitch-player.js index 8bb9966..c5c7028 100644 --- a/src/twitch-player.js +++ b/src/twitch-player.js @@ -13,16 +13,6 @@ new Twitch.Embed("twitch-embed", { channel: "wymillerlinux" }); -var follow = document.getElementById("twitch-follow"); -<<<<<<< HEAD -follow.addEventListener("click", function() { - //code goes here -======= -follow.addEventListener("click", function(user){ - this.user = user; ->>>>>>> 05b1d079479a667e15c6dcf18f1eb132b19c3849 -}, false); - /* var a = 42; var b = Number(a);