From a8556b04fd342a340482807214b78998fae1ae3a Mon Sep 17 00:00:00 2001 From: Julius Alexander IV Date: Sun, 2 Feb 2020 23:38:58 -0800 Subject: [PATCH 1/2] Black and white redesign. --- .gitignore | 1 + assets/src/App.css | 11 +++++-- assets/src/components/Button/index.js | 13 +++++--- .../containers/PageContainer/Navigation.js | 29 ++++++++-------- .../containers/PageContainer/PageContainer.js | 7 ++-- assets/src/pages/Listen/index.js | 33 ++++++++++++------- assets/src/utils/synthesizer/index.js | 20 +++++++---- choir.svg | 5 +++ 8 files changed, 80 insertions(+), 39 deletions(-) create mode 100644 choir.svg diff --git a/.gitignore b/.gitignore index ca838199..dc3b5717 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ /db /deps /*.ez +/*/.DS_STORE # Generated on crash by the VM erl_crash.dump diff --git a/assets/src/App.css b/assets/src/App.css index b0b71810..d817e674 100644 --- a/assets/src/App.css +++ b/assets/src/App.css @@ -10,7 +10,7 @@ html, body, main { } :root { - --chr-white: #EEE1C2; + --chr-white: #FFF7E4; --chr-black: #393D3F; --chr-red: #D26359; --chr-dark-green: #5D7967; @@ -44,11 +44,15 @@ html, body, main { .fontLarge { font-size: 2rem; } .fontHuge { font-size: 3rem; } .underlineNone { text-decoration: none; } +.underline { text-decoration: underline; } /* Layout stuff */ .block { display: block; } .inline { display: inline; } .flex { display: flex; } +.flexRow { flex-direction: row; } +.flexColumn { flex-direction: column; } +.grow1 { flex-grow: 1; } .alignCenter { align-items: center; } .justifyCenter { justify-content: center; } .heightAll { height: 100%; } @@ -57,9 +61,12 @@ html, body, main { .overflowAuto { overflow: auto; } .textCenter { text-align: center; } .justifyCenter { justify-content: center; } +.spaceAround { justify-content: space-around; } /* Borders */ .border { border: 2px solid; } +.borderBottom { border-bottom: 2px solid; } +.borderTop { border-top: 2px solid; } .bcRed { border-color: var(--chr-red); } .bcBlack { border-color: var(--chr-black); } @@ -134,4 +141,4 @@ html, body, main { } .cursorPointer { cursor: pointer; } .cursorDefault { cursor: default; } -.cursorHelp { cursor: help; } \ No newline at end of file +.cursorHelp { cursor: help; } diff --git a/assets/src/components/Button/index.js b/assets/src/components/Button/index.js index 3cd4d361..31e466ae 100644 --- a/assets/src/components/Button/index.js +++ b/assets/src/components/Button/index.js @@ -3,15 +3,20 @@ import classnames from "classnames"; import css from "