Merge branch 'master' of github.com:wesbos/JavaScript30

chillicoder · chillicoder · commit b2fc9019112e · 2016-12-14T20:05:24.000-06:00
diff --git a/01 - JavaScript Drum Kit/index.html b/01 - JavaScript Drum Kit/index.html
@@ -63,7 +63,7 @@
   function playSound(e) {
     const audio = document.querySelector(`audio[data-key="${e.keyCode}"]`);
     const key = document.querySelector(`.key[data-key="${e.keyCode}"]`);
-    if (!audio) return; // stop the function from running all together
+    if (!audio) return; // stop the function from running altogether
     audio.currentTime = 0; // rewind to the start
     audio.play();
     key.classList.add('playing');
diff --git a/02 - JS + CSS Clock/index-FINISHED.html b/02 - JS + CSS Clock/index-FINISHED.html
@@ -85,7 +85,7 @@
     minsHand.style.transform = `rotate(${minsDegrees}deg)`;
 
     const hour = now.getHours();
-    const hourDegrees = ((mins / 12) * 360) + 90;
+    const hourDegrees = ((hour / 12) * 360) + 90;
     hourHand.style.transform = `rotate(${hourDegrees}deg)`;
   }
 
diff --git a/02 - JS + CSS Clock/index.html b/02 - JS + CSS Clock/index.html
diff --git a/24 - Sticky Nav/index-START.html b/24 - Sticky Nav/index-START.html
@@ -54,20 +54,7 @@ <h1>A story about getting lost.</h1>
   </div>
 
 <script>
-  const nav = document.querySelector('#main');
-  const topOfNav = nav.offsetTop;
-
-  function fixNav() {
-    if(window.scrollY >= topOfNav) {
-      document.body.style.paddingTop = nav.offsetHeight + 'px';
-      document.body.classList.add('fixed-nav');
-    } else {
-      document.body.style.paddingTop = 0;
-      document.body.classList.remove('fixed-nav');
-    }
-  }
-
-  window.addEventListener('scroll', fixNav);
+
 </script>
 
 </body>
diff --git a/24 - Sticky Nav/style-START.css b/24 - Sticky Nav/style-START.css
@@ -23,10 +23,6 @@ body {
   transition: transform 0.5s;
 }
 
-.fixed-nav .site-wrap {
-  transform: scale(1);
-}
-
 header {
   text-align: center;
   height:50vh;
@@ -52,11 +48,6 @@ nav {
   z-index: 1;
 }
 
-.fixed-nav nav {
-  position: fixed;
-  box-shadow: 0 5px rgba(0,0,0,0.1)
-}
-
 nav ul {
   margin: 0;
   padding:0;
@@ -81,10 +72,6 @@ li.logo {
   font-size: 30px;
 }
 
-.fixed-nav li.logo {
-  max-width:500px;
-}
-
 li.logo a {
   color:black;
 }

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@`
`85`	`85`	minsHand.style.transform = `rotate(${minsDegrees}deg)`;
`86`	`86`
`87`	`87`	`const hour = now.getHours();`
`88`		`- const hourDegrees = ((mins / 12) * 360) + 90;`
	`88`	`+ const hourDegrees = ((hour / 12) * 360) + 90;`
`89`	`89`	hourHand.style.transform = `rotate(${hourDegrees}deg)`;
`90`	`90`	`}`
`91`	`91`