Skip to content

Commit 3896cde

Browse files
committed
Merge branch 'master' of github.com:wesbos/JavaScript30 into exercises
2 parents 889c0fe + 7c9030e commit 3896cde

File tree

15 files changed

+15
-254
lines changed

15 files changed

+15
-254
lines changed

01 - JavaScript Drum Kit/index.html

Lines changed: 0 additions & 83 deletions
This file was deleted.

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 = ((mins / 12) * 360) + 90;
88+
const hourDegrees = ((hour / 12) * 360) + ((mins/60)*30) + 90;
8989
hourHand.style.transform = `rotate(${hourDegrees}deg)`;
9090
}
9191

02 - JS + CSS Clock/index.html

Lines changed: 0 additions & 96 deletions
This file was deleted.

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-FINISHED.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@
8181
// 7. sort Exercise
8282
// Sort the people alphabetically by last name
8383
const alpha = people.sort((lastOne, nextOne) => {
84-
const [aFirst, aLast] = lastOne.split(', ');
85-
const [bFirst, bLast] = nextOne.split(', ');
84+
const [aLast, aFirst] = lastOne.split(', ');
85+
const [bLast, bFirst] = nextOne.split(', ');
8686
return aLast > bLast ? 1 : -1;
8787
});
8888
console.log(alpha);

07 - Array Cardio Day 2/index-START.html

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@
3030
const year19 = year - 19;
3131
console.log('At least one person 19: ' + people.some(person => person.year < year19));
3232

33-
// Array.prototype.every() // is everyone 19?
34-
console.log('Every person 19: ' + people.every(person => person.year < year19));
35-
3633
// Array.prototype.find()
3734
// Find is like filter, but instead returns just the one you are looking for
3835
// find the comment with the ID of 823423

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>

11 - Custom Video Player/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<div class="progress__filled"></div>
1616
</div>
1717
<button class="player__button toggle" title="Toggle Play"></button>
18-
<input type="range" name="volume" class="player__slider" min=0 max="1" step="0.05" value="1">
18+
<input type="range" name="volume" class="player__slider" min="0" max="1" step="0.05" value="1">
1919
<input type="range" name="playbackRate" class="player__slider" min="0.5" max="2" step="0.1" value="1">
2020
<button data-skip="-10" class="player__button">« 10s</button>
2121
<button data-skip="25" class="player__button">25s »</button>

0 commit comments

Comments
 (0)