Skip to content

Commit

Permalink
Webpack 5 update (#33)
Browse files Browse the repository at this point in the history
* 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 <>
  • Loading branch information
looshi authored Dec 10, 2022
1 parent a47c6f0 commit e3a89d6
Show file tree
Hide file tree
Showing 29 changed files with 10,787 additions and 9,186 deletions.
6 changes: 2 additions & 4 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
{
"presets": [
["es2015", {"modules": false}],
"es2016",
"react",
],
"@babel/preset-react"
]
}
93 changes: 74 additions & 19 deletions css/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,10 @@ h2 {
padding: 80px;
text-align: center;
max-width: 600px;
margin:0 auto;
margin: 0 auto;
}
.get-started button{

.get-started button {
background-color: $blue;
padding: 24px 36px;
color: white;
Expand Down Expand Up @@ -62,12 +63,14 @@ header {
margin: 0;
padding: 0;
}

a {
margin-left: 22px;
margin-top: 13px;
vertical-align: top;
display: inline-block;
text-decoration: underline;

&:hover {
cursor: pointer;
}
Expand All @@ -76,16 +79,18 @@ header {
.header-controls {
display: flex;
justify-content: space-between;
margin: 0;
margin: 0 auto;
padding: 24px 0 0 0;
align-items: center;
width: 800px;
}
}

.scroll-contents {
width: 960px;
margin: 0 auto 40px;
padding-left: 20px;

/* Pads the bottom so the controls can scroll above the keyboard. */
.scroll-footer {
height: 280px;
Expand All @@ -107,20 +112,25 @@ footer {
which causes notice-able stuttering in audio playback when ARP is on.
*/
transform: translate3d(0, 0, 0);

.footer-info {
padding: 4px;
text-align: right;
}
a, p {

a,
p {
font-size: 12px;
display: inline-block;
margin: 0 12px 0 0;
font-weight: 400;
letter-spacing: 0.06em;
}

a {
color: white;
text-decoration: underline;

&:hover {
cursor: pointer;
}
Expand All @@ -129,19 +139,23 @@ footer {

.share-button-row {
display: inline-block;

.share-button-container {
display: inline-block;
}

.share-button {
display: inline-block;
border: 1px solid $blue;
border-radius: 24px;
vertical-align: middle;
vertical-align: middle;

&:hover {
cursor: pointer;
border: 1px solid white;
}
}

.share-count {
display: inline-block;
vertical-align: top;
Expand Down Expand Up @@ -169,7 +183,7 @@ h1 {
}

.module {
display:inline-block;
display: inline-block;
width: 300px;
margin-right: 20px;
}
Expand All @@ -184,11 +198,13 @@ h1 {
vertical-align: middle;
text-align: center;

&:hover, &.selected {
&:hover,
&.selected {
cursor: pointer;
color: #fff;
background-color: $blue;
}

&.algorithm-button {
margin-left: 23px;
}
Expand All @@ -197,33 +213,44 @@ h1 {

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

&.plus.color-#{$current-color} {
background: url('../images/operator-btns.png');
background-position: 411px $y;
&:hover, &.selected {

&:hover,
&.selected {
background-position: 147px $y;
}
}

&.minus.color-#{$current-color} {
background: url('../images/operator-btns.png');
background-position: 288px $y;
&:hover, &.selected {

&:hover,
&.selected {
background-position: 39px $y;
}
}

&.divide.color-#{$current-color} {
background: url('../images/operator-btns.png');
background-position: 349px $y;
&:hover, &.selected {

&:hover,
&.selected {
background-position: 93px $y;
}
}

&.multiply.color-#{$current-color} {
background: url('../images/operator-btns.png');
background-position: 471px $y;
&:hover, &.selected {

&:hover,
&.selected {
background-position: 201px $y;
}
}
Expand All @@ -234,27 +261,39 @@ h1 {
width: 52px;
height: 52px;
background: url('../images/lfo-shape-btns.png');

&.random {
background-position: 74px -66px;
&:hover, &.selected {

&:hover,
&.selected {
background-position: 207px -67px;
}
}

&.triangle {
background-position: 138px -1px;
&:hover, &.selected {

&:hover,
&.selected {
background-position: -1px -1px;
}
}

&.sawtooth {
background-position: 72px -1px;
&:hover, &.selected {

&:hover,
&.selected {
background-position: -67px -1px;
}
}

&.square {
background-position: 137px 57px;
&:hover, &.selected {

&:hover,
&.selected {
background-position: -1px 53px;
}
}
Expand All @@ -263,6 +302,7 @@ h1 {
.algorithm-switch {
margin: 20px 0;
}

.combine-prompt {
font-size: 16px;
display: inline-block;
Expand All @@ -273,17 +313,21 @@ h1 {
.oscillator-sliders {
margin: 16px 0 0 0;
}

.horizontal-slider {
margin: 6px 0 0 0;

.slider-label {
display: inline-block;
width: 80px;
}

.slider-value {
display: inline-block;
text-align: right;
width: 34px;
}

input {
display: inline-block;
width: 180px;
Expand All @@ -301,8 +345,10 @@ h1 {
.asdr-sliders {
display: inline-block;
margin-left: 38px;

.vertical-slider {
width: 10px;

.vertical-slider-container {
margin-left: -7px;
}
Expand All @@ -311,21 +357,25 @@ h1 {

// LFOs
.lfo {
.shape-switch{
.shape-switch {
width: 142px;
display: inline-block;
vertical-align: top;
margin: 25px 16px;

.wave-label {
text-align: center;
}
}

.sliders {
display: inline-block;
}

.toggle-button {
margin: 8px;
}

.Select-arrow-zone {
padding-right: 15px;
}
Expand All @@ -335,13 +385,14 @@ h1 {
.arp-switch-label {
margin-bottom: 12px;
text-align: center;
display:block;
display: block;
}

.arpeggiator-switch {
display: flex;
vertical-align: bottom;
.toggle-button:first-child{

.toggle-button:first-child {
margin-bottom: 12px;
}
}
Expand All @@ -352,21 +403,25 @@ h1 {
float: right;
padding: 10px;
font-size: 16px;

&:hover {
cursor: pointer;
}
}

p {
text-align: center;
max-width: 500px;
margin: 12px auto;

&.inverted {
border: 3px solid $blue;
word-wrap: break-word;
padding: 32px;
max-width: 436px;
}
}

img {
margin: 0 auto;
display: block;
Expand Down
Loading

0 comments on commit e3a89d6

Please sign in to comment.