Skip to content

Commit e3a89d6

Browse files
authored
Webpack 5 update (#33)
* Fix PropTypes * Wip webpack 5 update * Fix load issues * Fix Select * Update about page, fix defaults * Update to use createRoot * Remove react-share Co-authored-by: looshi <>
1 parent a47c6f0 commit e3a89d6

29 files changed

+10787
-9186
lines changed

.babelrc

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
{
22
"presets": [
3-
["es2015", {"modules": false}],
4-
"es2016",
5-
"react",
6-
],
3+
"@babel/preset-react"
4+
]
75
}

css/index.scss

Lines changed: 74 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,10 @@ h2 {
3030
padding: 80px;
3131
text-align: center;
3232
max-width: 600px;
33-
margin:0 auto;
33+
margin: 0 auto;
3434
}
35-
.get-started button{
35+
36+
.get-started button {
3637
background-color: $blue;
3738
padding: 24px 36px;
3839
color: white;
@@ -62,12 +63,14 @@ header {
6263
margin: 0;
6364
padding: 0;
6465
}
66+
6567
a {
6668
margin-left: 22px;
6769
margin-top: 13px;
6870
vertical-align: top;
6971
display: inline-block;
7072
text-decoration: underline;
73+
7174
&:hover {
7275
cursor: pointer;
7376
}
@@ -76,16 +79,18 @@ header {
7679
.header-controls {
7780
display: flex;
7881
justify-content: space-between;
79-
margin: 0;
82+
margin: 0 auto;
8083
padding: 24px 0 0 0;
8184
align-items: center;
85+
width: 800px;
8286
}
8387
}
8488

8589
.scroll-contents {
8690
width: 960px;
8791
margin: 0 auto 40px;
8892
padding-left: 20px;
93+
8994
/* Pads the bottom so the controls can scroll above the keyboard. */
9095
.scroll-footer {
9196
height: 280px;
@@ -107,20 +112,25 @@ footer {
107112
which causes notice-able stuttering in audio playback when ARP is on.
108113
*/
109114
transform: translate3d(0, 0, 0);
115+
110116
.footer-info {
111117
padding: 4px;
112118
text-align: right;
113119
}
114-
a, p {
120+
121+
a,
122+
p {
115123
font-size: 12px;
116124
display: inline-block;
117125
margin: 0 12px 0 0;
118126
font-weight: 400;
119127
letter-spacing: 0.06em;
120128
}
129+
121130
a {
122131
color: white;
123132
text-decoration: underline;
133+
124134
&:hover {
125135
cursor: pointer;
126136
}
@@ -129,19 +139,23 @@ footer {
129139

130140
.share-button-row {
131141
display: inline-block;
142+
132143
.share-button-container {
133144
display: inline-block;
134145
}
146+
135147
.share-button {
136148
display: inline-block;
137149
border: 1px solid $blue;
138150
border-radius: 24px;
139-
vertical-align: middle;
151+
vertical-align: middle;
152+
140153
&:hover {
141154
cursor: pointer;
142155
border: 1px solid white;
143156
}
144157
}
158+
145159
.share-count {
146160
display: inline-block;
147161
vertical-align: top;
@@ -169,7 +183,7 @@ h1 {
169183
}
170184

171185
.module {
172-
display:inline-block;
186+
display: inline-block;
173187
width: 300px;
174188
margin-right: 20px;
175189
}
@@ -184,11 +198,13 @@ h1 {
184198
vertical-align: middle;
185199
text-align: center;
186200

187-
&:hover, &.selected {
201+
&:hover,
202+
&.selected {
188203
cursor: pointer;
189204
color: #fff;
190205
background-color: $blue;
191206
}
207+
192208
&.algorithm-button {
193209
margin-left: 23px;
194210
}
@@ -197,33 +213,44 @@ h1 {
197213

198214
@for $i from 1 through length($colors-list) {
199215
$current-color: nth($colors-list, $i);
200-
$y: (-7 + $i * 46) + px;
216+
$y: (-7 + $i * 46)+px;
201217

202218
&.plus.color-#{$current-color} {
203219
background: url('../images/operator-btns.png');
204220
background-position: 411px $y;
205-
&:hover, &.selected {
221+
222+
&:hover,
223+
&.selected {
206224
background-position: 147px $y;
207225
}
208226
}
227+
209228
&.minus.color-#{$current-color} {
210229
background: url('../images/operator-btns.png');
211230
background-position: 288px $y;
212-
&:hover, &.selected {
231+
232+
&:hover,
233+
&.selected {
213234
background-position: 39px $y;
214235
}
215236
}
237+
216238
&.divide.color-#{$current-color} {
217239
background: url('../images/operator-btns.png');
218240
background-position: 349px $y;
219-
&:hover, &.selected {
241+
242+
&:hover,
243+
&.selected {
220244
background-position: 93px $y;
221245
}
222246
}
247+
223248
&.multiply.color-#{$current-color} {
224249
background: url('../images/operator-btns.png');
225250
background-position: 471px $y;
226-
&:hover, &.selected {
251+
252+
&:hover,
253+
&.selected {
227254
background-position: 201px $y;
228255
}
229256
}
@@ -234,27 +261,39 @@ h1 {
234261
width: 52px;
235262
height: 52px;
236263
background: url('../images/lfo-shape-btns.png');
264+
237265
&.random {
238266
background-position: 74px -66px;
239-
&:hover, &.selected {
267+
268+
&:hover,
269+
&.selected {
240270
background-position: 207px -67px;
241271
}
242272
}
273+
243274
&.triangle {
244275
background-position: 138px -1px;
245-
&:hover, &.selected {
276+
277+
&:hover,
278+
&.selected {
246279
background-position: -1px -1px;
247280
}
248281
}
282+
249283
&.sawtooth {
250284
background-position: 72px -1px;
251-
&:hover, &.selected {
285+
286+
&:hover,
287+
&.selected {
252288
background-position: -67px -1px;
253289
}
254290
}
291+
255292
&.square {
256293
background-position: 137px 57px;
257-
&:hover, &.selected {
294+
295+
&:hover,
296+
&.selected {
258297
background-position: -1px 53px;
259298
}
260299
}
@@ -263,6 +302,7 @@ h1 {
263302
.algorithm-switch {
264303
margin: 20px 0;
265304
}
305+
266306
.combine-prompt {
267307
font-size: 16px;
268308
display: inline-block;
@@ -273,17 +313,21 @@ h1 {
273313
.oscillator-sliders {
274314
margin: 16px 0 0 0;
275315
}
316+
276317
.horizontal-slider {
277318
margin: 6px 0 0 0;
319+
278320
.slider-label {
279321
display: inline-block;
280322
width: 80px;
281323
}
324+
282325
.slider-value {
283326
display: inline-block;
284327
text-align: right;
285328
width: 34px;
286329
}
330+
287331
input {
288332
display: inline-block;
289333
width: 180px;
@@ -301,8 +345,10 @@ h1 {
301345
.asdr-sliders {
302346
display: inline-block;
303347
margin-left: 38px;
348+
304349
.vertical-slider {
305350
width: 10px;
351+
306352
.vertical-slider-container {
307353
margin-left: -7px;
308354
}
@@ -311,21 +357,25 @@ h1 {
311357

312358
// LFOs
313359
.lfo {
314-
.shape-switch{
360+
.shape-switch {
315361
width: 142px;
316362
display: inline-block;
317363
vertical-align: top;
318364
margin: 25px 16px;
365+
319366
.wave-label {
320367
text-align: center;
321368
}
322369
}
370+
323371
.sliders {
324372
display: inline-block;
325373
}
374+
326375
.toggle-button {
327376
margin: 8px;
328377
}
378+
329379
.Select-arrow-zone {
330380
padding-right: 15px;
331381
}
@@ -335,13 +385,14 @@ h1 {
335385
.arp-switch-label {
336386
margin-bottom: 12px;
337387
text-align: center;
338-
display:block;
388+
display: block;
339389
}
340390

341391
.arpeggiator-switch {
342392
display: flex;
343393
vertical-align: bottom;
344-
.toggle-button:first-child{
394+
395+
.toggle-button:first-child {
345396
margin-bottom: 12px;
346397
}
347398
}
@@ -352,21 +403,25 @@ h1 {
352403
float: right;
353404
padding: 10px;
354405
font-size: 16px;
406+
355407
&:hover {
356408
cursor: pointer;
357409
}
358410
}
411+
359412
p {
360413
text-align: center;
361414
max-width: 500px;
362415
margin: 12px auto;
416+
363417
&.inverted {
364418
border: 3px solid $blue;
365419
word-wrap: break-word;
366420
padding: 32px;
367421
max-width: 436px;
368422
}
369423
}
424+
370425
img {
371426
margin: 0 auto;
372427
display: block;

0 commit comments

Comments
 (0)