From 35c60694ae964e52154cee0f7b48561e5c948414 Mon Sep 17 00:00:00 2001 From: Aoife Date: Tue, 20 Apr 2021 13:17:15 +0200 Subject: [PATCH] Make timbre layout responsive --- public/manifest.json | 10 ----- src/App.js | 2 +- src/features/editor/Timbre.js | 50 +++++++++++------------ src/features/editor/card.js | 13 +++--- src/features/editor/index.js | 2 +- src/features/editor/parameters/Amp.js | 24 +++++------ src/features/editor/parameters/Filter.js | 4 +- src/features/editor/parameters/LFO.js | 20 ++++----- src/features/editor/parameters/Mixer.js | 16 ++++---- src/features/editor/parameters/Patches.js | 2 +- src/features/editor/parameters/Pitch.js | 46 ++++++++++----------- src/features/editor/parameters/VCO.js | 12 +++--- src/features/io/convert/loadStore.js | 1 - src/features/io/convert/parse.js | 1 - src/features/io/convert/serialise.js | 26 ++++++------ src/features/menu/index.js | 3 +- 16 files changed, 111 insertions(+), 121 deletions(-) diff --git a/public/manifest.json b/public/manifest.json index 080d6c7..1f2f141 100644 --- a/public/manifest.json +++ b/public/manifest.json @@ -6,16 +6,6 @@ "src": "favicon.ico", "sizes": "64x64 32x32 24x24 16x16", "type": "image/x-icon" - }, - { - "src": "logo192.png", - "type": "image/png", - "sizes": "192x192" - }, - { - "src": "logo512.png", - "type": "image/png", - "sizes": "512x512" } ], "start_url": ".", diff --git a/src/App.js b/src/App.js index 5abc415..8666f22 100644 --- a/src/App.js +++ b/src/App.js @@ -8,7 +8,7 @@ function App() { return false; }; return ( -
+
diff --git a/src/features/editor/Timbre.js b/src/features/editor/Timbre.js index f33829e..37b2974 100644 --- a/src/features/editor/Timbre.js +++ b/src/features/editor/Timbre.js @@ -13,10 +13,10 @@ import { selectById } from './timbreSlice.js'; export default function Timbre(props) { const ids = useSelector((state) => selectById(state, props.id)); return ( -
+
- - -
-
- - - -
-
+ + + + + + + - +
); } diff --git a/src/features/editor/card.js b/src/features/editor/card.js index feac6de..eb7e4e7 100644 --- a/src/features/editor/card.js +++ b/src/features/editor/card.js @@ -1,16 +1,17 @@ -export default function Card(props = { className: 'col-span-2' }) { +export default function Card(props) { return (
-
-

+ ' mb-4 mr-4 flex flex-col justify-start border border-gray-300 rounded-md shadow-md bg-white' + } + > +
+

{props.header}

-
+
{props.children}

diff --git a/src/features/editor/index.js b/src/features/editor/index.js index d6a2b71..53554be 100644 --- a/src/features/editor/index.js +++ b/src/features/editor/index.js @@ -6,7 +6,7 @@ import { useSelector } from 'react-redux'; export default function Editor() { const activeTab = useSelector((state) => state.parameters.activeTab); return ( -
+
{activeTab === 'Timbre1' ? : null} {activeTab === 'Timbre2' ? : null} {activeTab === 'Vocoder' ? : null} diff --git a/src/features/editor/parameters/Amp.js b/src/features/editor/parameters/Amp.js index 7e68086..759258f 100644 --- a/src/features/editor/parameters/Amp.js +++ b/src/features/editor/parameters/Amp.js @@ -10,8 +10,8 @@ export default function Amp(props) { return ( -
-
+
+

Amp Level

-
+

Pan Pot

-
-
+
+

Keyboard Track

-
+

Distortion

{ return ( -
-
+
+

Amp Level

{ } />
-
+

Direct Level

{ />
-
-
+
+

Keyboard Track

{ } />
-
+

Distortion

-
+

Filter Type

@@ -26,10 +26,10 @@ export default function LFO(props) { } />
-
+

Key Sync

-
+

Frequency

-
-
-

Volume 1

+ +
+
+

Volume 1

-
-

Volume 2

+
+

Volume 2

-
-

Volume 3

+
+

Volume 3

{ return ( -
+

Source

@@ -27,10 +27,10 @@ export default function Pitch(props) { } />
-
-

Trigger Mode

+
+

Trigger Mode

-
+

{`${props.dwgsOrModTypeName}`}