Skip to content

Commit dbd6aeb

Browse files
committed
Merge branch 'master' into Work-In-Progress
2 parents 9182847 + 9ef92a4 commit dbd6aeb

File tree

13 files changed

+60
-35
lines changed

13 files changed

+60
-35
lines changed

01 - JavaScript Drum Kit/style.css

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
html {
22
font-size: 10px;
3-
background:url(http://i.imgur.com/b9r5sEL.jpg) bottom center;
3+
background: url(http://i.imgur.com/b9r5sEL.jpg) bottom center;
44
background-size: cover;
55
}
66
body,html {
@@ -10,41 +10,41 @@ body,html {
1010
}
1111

1212
.keys {
13-
display:flex;
14-
flex:1;
15-
min-height:100vh;
13+
display: flex;
14+
flex: 1;
15+
min-height: 100vh;
1616
align-items: center;
1717
justify-content: center;
1818
}
1919

2020
.key {
21-
border:4px solid black;
22-
border-radius:5px;
23-
margin:1rem;
21+
border: .4rem solid black;
22+
border-radius: .5rem;
23+
margin: 1rem;
2424
font-size: 1.5rem;
25-
padding:1rem .5rem;
26-
transition:all .07s;
27-
width:100px;
25+
padding: 1rem .5rem;
26+
transition: all .07s ease;
27+
width: 10rem;
2828
text-align: center;
29-
color:white;
30-
background:rgba(0,0,0,0.4);
31-
text-shadow:0 0 5px black;
29+
color: white;
30+
background: rgba(0,0,0,0.4);
31+
text-shadow: 0 0 .5rem black;
3232
}
3333

3434
.playing {
35-
transform:scale(1.1);
36-
border-color:#ffc600;
37-
box-shadow: 0 0 10px #ffc600;
35+
transform: scale(1.1);
36+
border-color: #ffc600;
37+
box-shadow: 0 0 1rem #ffc600;
3838
}
3939

4040
kbd {
4141
display: block;
42-
font-size: 40px;
42+
font-size: 4rem;
4343
}
4444

4545
.sound {
4646
font-size: 1.2rem;
4747
text-transform: uppercase;
48-
letter-spacing: 1px;
49-
color:#ffc600;
48+
letter-spacing: .1rem;
49+
color: #ffc600;
5050
}

02 - JS + CSS Clock/index-FINISHED.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,11 @@
8181
secondHand.style.transform = `rotate(${secondsDegrees}deg)`;
8282

8383
const mins = now.getMinutes();
84-
const minsDegrees = ((mins / 60) * 360) + 90;
84+
const minsDegrees = ((mins / 60) * 360) + ((seconds/60)*6) + 90;
8585
minsHand.style.transform = `rotate(${minsDegrees}deg)`;
8686

8787
const hour = now.getHours();
88-
const hourDegrees = ((hour / 12) * 360) + 90;
88+
const hourDegrees = ((hour / 12) * 360) + ((mins/60)*30) + 90;
8989
hourHand.style.transform = `rotate(${hourDegrees}deg)`;
9090
}
9191

03 - CSS Variables/index-FINISHED.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ <h2>Update CSS Variables with <span class='hl'>JS</span></h2>
99

1010
<div class="controls">
1111
<label for="spacing">Spacing:</label>
12-
<input type="range" name="spacing" min="10" max="200" value="10" data-sizing="px">
12+
<input id="spacing" type="range" name="spacing" min="10" max="200" value="10" data-sizing="px">
1313

1414
<label for="blur">Blur:</label>
15-
<input type="range" name="blur" min="0" max="25" value="10" data-sizing="px">
15+
<input id="blur" type="range" name="blur" min="0" max="25" value="10" data-sizing="px">
1616

1717
<label for="base">Base Color</label>
18-
<input type="color" name="base" value="#ffc600">
18+
<input id="base" type="color" name="base" value="#ffc600">
1919
</div>
2020

2121
<img src="https://source.unsplash.com/7bwQXzbF6KE/800x500">

03 - CSS Variables/index-START.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ <h2>Update CSS Variables with <span class='hl'>JS</span></h2>
99

1010
<div class="controls">
1111
<label for="spacing">Spacing:</label>
12-
<input type="range" name="spacing" min="10" max="200" value="10" data-sizing="px">
12+
<input id="spacing" type="range" name="spacing" min="10" max="200" value="10" data-sizing="px">
1313

1414
<label for="blur">Blur:</label>
15-
<input type="range" name="blur" min="0" max="25" value="10" data-sizing="px">
15+
<input id="blur" type="range" name="blur" min="0" max="25" value="10" data-sizing="px">
1616

1717
<label for="base">Base Color</label>
18-
<input type="color" name="base" value="#ffc600">
18+
<input id="base" type="color" name="base" value="#ffc600">
1919
</div>
2020

2121
<img src="https://source.unsplash.com/7bwQXzbF6KE/800x500">

04 - Array Cardio Day 1/index-START.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
{ first: 'Hanna', last: 'Hammarström', year: 1829, passed: 1909 }
2828
];
2929

30-
const people = ['Beck, Glenn', 'Becker, Carl', 'Beckett, Samuel', 'Beddoes, Mick', 'Beecher, Henry', 'Beethoven, Ludwig', 'Begin, Menachem', 'Belloc, Hilaire', 'Bellow, Saul', 'Benchley, Robert', 'Benenson, Peter', 'Ben-Gurion, David', 'Benjamin, Walter', 'Benn, Tony', 'Bennington, Chester', 'Benson, Leana', 'Bent, Silas', 'Bentsen, Lloyd', 'Berger, Ric', 'Bergman, Ingmar', 'Berio, Luciano', 'Berle, Milton', 'Berlin, Irving', 'Berne, Eric', 'Bernhard, Sandra', 'Berra, Yogi', 'Berry, Halle', 'Berry, Wendell', 'Bethea, Erin', 'Bevan, Aneurin', 'Bevel, Ken', 'Biden, Joseph', 'Bierce, Ambrose', 'Biko, Steve', 'Billings, Josh', 'Biondo, Frank', 'Birrell, Augustine', 'Black Elk', 'Blair, Robert', 'Blair, Tony', 'Blake, William'];
30+
const people = ['Beck, Glenn', 'Becker, Carl', 'Beckett, Samuel', 'Beddoes, Mick', 'Beecher, Henry', 'Beethoven, Ludwig', 'Begin, Menachem', 'Belloc, Hilaire', 'Bellow, Saul', 'Benchley, Robert', 'Benenson, Peter', 'Ben-Gurion, David', 'Benjamin, Walter', 'Benn, Tony', 'Bennington, Chester', 'Benson, Leana', 'Bent, Silas', 'Bentsen, Lloyd', 'Berger, Ric', 'Bergman, Ingmar', 'Berio, Luciano', 'Berle, Milton', 'Berlin, Irving', 'Berne, Eric', 'Bernhard, Sandra', 'Berra, Yogi', 'Berry, Halle', 'Berry, Wendell', 'Bethea, Erin', 'Bevan, Aneurin', 'Bevel, Ken', 'Biden, Joseph', 'Bierce, Ambrose', 'Biko, Steve', 'Billings, Josh', 'Biondo, Frank', 'Birrell, Augustine', 'Black, Elk', 'Blair, Robert', 'Blair, Tony', 'Blake, William'];
3131

3232
// Array.prototype.filter()
3333
// 1. Filter the list of inventors for those who were born in the 1500's

10 - Hold Shift and Check Checkboxes/index-FINISHED.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="en">
33
<head>
44
<meta charset="UTF-8">
5-
<title>Document</title>
5+
<title>Hold Shift to Check Multiple Checkboxes</title>
66
</head>
77
<body>
88
<style>

10 - Hold Shift and Check Checkboxes/index-START.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="en">
33
<head>
44
<meta charset="UTF-8">
5-
<title>Document</title>
5+
<title>Hold Shift to Check Multiple Checkboxes</title>
66
</head>
77
<body>
88
<style>

18 - Adding Up Times with Reduce/index-FINISHED.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@
180180
<li data-time="4:04">
181181
Video 58
182182
</li>
183-
183+
</ul>
184184
<script>
185185

186186
const timeNodes = Array.from(document.querySelectorAll('[data-time]'));

18 - Adding Up Times with Reduce/index-START.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@
180180
<li data-time="4:04">
181181
Video 58
182182
</li>
183-
183+
</ul>
184184
<script>
185185
</script>
186186
</body>

22 - Follow Along Link Highlighter/index-FINISHED.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
const triggers = document.querySelectorAll('a');
3030
const highlight = document.createElement('span');
3131
highlight.classList.add('highlight');
32-
document.body.append(highlight);
32+
document.body.appendChild(highlight);
3333

3434
function highlightLink() {
3535
const linkCoords = this.getBoundingClientRect();

0 commit comments

Comments
 (0)