diff --git a/01 - JavaScript Drum Kit/index-FINISHED.html b/01 - JavaScript Drum Kit/index-FINISHED.html
old mode 100644
new mode 100755
diff --git a/01 - JavaScript Drum Kit/index-START.html b/01 - JavaScript Drum Kit/index-START.html
old mode 100644
new mode 100755
index 4070d32767..92cbe6b5de
--- a/01 - JavaScript Drum Kit/index-START.html
+++ b/01 - JavaScript Drum Kit/index-START.html
@@ -58,7 +58,23 @@
diff --git a/01 - JavaScript Drum Kit/index.html b/01 - JavaScript Drum Kit/index.html
deleted file mode 100644
index a18f2bc2ca..0000000000
--- a/01 - JavaScript Drum Kit/index.html
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-
-
- JS Drum Kit
-
-
-
-
-
-
-
- A
- clap
-
-
- S
- hihat
-
-
- D
- kick
-
-
- F
- openhat
-
-
- G
- boom
-
-
- H
- ride
-
-
- J
- snare
-
-
- K
- tom
-
-
- L
- tink
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/01 - JavaScript Drum Kit/style.css b/01 - JavaScript Drum Kit/style.css
old mode 100644
new mode 100755
index 3e0a320b37..075578c930
--- a/01 - JavaScript Drum Kit/style.css
+++ b/01 - JavaScript Drum Kit/style.css
@@ -1,6 +1,6 @@
html {
font-size: 10px;
- background:url(http://i.imgur.com/b9r5sEL.jpg) bottom center;
+ background: url(http://i.imgur.com/b9r5sEL.jpg) bottom center;
background-size: cover;
}
body,html {
@@ -10,41 +10,41 @@ body,html {
}
.keys {
- display:flex;
- flex:1;
- min-height:100vh;
+ display: flex;
+ flex: 1;
+ min-height: 100vh;
align-items: center;
justify-content: center;
}
.key {
- border:4px solid black;
- border-radius:5px;
- margin:1rem;
+ border: .4rem solid black;
+ border-radius: .5rem;
+ margin: 1rem;
font-size: 1.5rem;
- padding:1rem .5rem;
- transition:all .07s;
- width:100px;
+ padding: 1rem .5rem;
+ transition: all .07s ease;
+ width: 10rem;
text-align: center;
- color:white;
- background:rgba(0,0,0,0.4);
- text-shadow:0 0 5px black;
+ color: white;
+ background: rgba(0,0,0,0.4);
+ text-shadow: 0 0 .5rem black;
}
.playing {
- transform:scale(1.1);
- border-color:#ffc600;
- box-shadow: 0 0 10px #ffc600;
+ transform: scale(1.1);
+ border-color: #ffc600;
+ box-shadow: 0 0 1rem #ffc600;
}
kbd {
display: block;
- font-size: 40px;
+ font-size: 4rem;
}
.sound {
font-size: 1.2rem;
text-transform: uppercase;
- letter-spacing: 1px;
- color:#ffc600;
+ letter-spacing: .1rem;
+ color: #ffc600;
}
diff --git a/02 - JS + CSS Clock/index-START.html b/02 - JS + CSS Clock/index-START.html
deleted file mode 100644
index 259280d228..0000000000
--- a/02 - JS + CSS Clock/index-START.html
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
-
- Document
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/02 - JS + CSS Clock/index-FINISHED.html b/02 - JS and CSS Clock/index-FINISHED.html
old mode 100644
new mode 100755
similarity index 88%
rename from 02 - JS + CSS Clock/index-FINISHED.html
rename to 02 - JS and CSS Clock/index-FINISHED.html
index 36c420f534..37436ed1ca
--- a/02 - JS + CSS Clock/index-FINISHED.html
+++ b/02 - JS and CSS Clock/index-FINISHED.html
@@ -2,7 +2,7 @@
- Document
+ JS + CSS Clock
@@ -26,6 +26,7 @@
}
body {
+ margin: 0;
font-size: 2rem;
display:flex;
flex:1;
@@ -42,7 +43,7 @@
position: relative;
padding:2rem;
box-shadow:
- 0 0 0px 4px rgba(0,0,0,0.1),
+ 0 0 0 4px rgba(0,0,0,0.1),
inset 0 0 0 3px #EFEFEF,
inset 0 0 10px black,
0 0 10px rgba(0,0,0,0.2);
@@ -81,16 +82,18 @@
secondHand.style.transform = `rotate(${secondsDegrees}deg)`;
const mins = now.getMinutes();
- const minsDegrees = ((mins / 60) * 360) + 90;
+ const minsDegrees = ((mins / 60) * 360) + ((seconds/60)*6) + 90;
minsHand.style.transform = `rotate(${minsDegrees}deg)`;
- const hour = now.getMinutes();
- const hourDegrees = ((mins / 12) * 360) + 90;
+ const hour = now.getHours();
+ const hourDegrees = ((hour / 12) * 360) + ((mins/60)*30) + 90;
hourHand.style.transform = `rotate(${hourDegrees}deg)`;
}
setInterval(setDate, 1000);
+ setDate();
+
diff --git a/02 - JS + CSS Clock/index.html b/02 - JS and CSS Clock/index-START.html
old mode 100644
new mode 100755
similarity index 98%
rename from 02 - JS + CSS Clock/index.html
rename to 02 - JS and CSS Clock/index-START.html
index 36c420f534..43991416c1
--- a/02 - JS + CSS Clock/index.html
+++ b/02 - JS and CSS Clock/index-START.html
@@ -66,9 +66,9 @@
transition: all 0.05s;
transition-timing-function: cubic-bezier(0.1, 2.7, 0.58, 1);
}
-
-
+