feat/offtube: preset Aux - Fader 1:1

css ChanStrip static placement default Fader xx when no label has been added
olzzon · Nov 25, 2019 · 16cc5d3 · 16cc5d3
1 parent c4a3297
commit 16cc5d3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/src/assets/css/ChanStrip.css b/src/assets/css/ChanStrip.css
@@ -1,13 +1,13 @@
 .chan-strip-body {
-	position: absolute;
+	position: fixed;
 	display: flex;
-	top: 2px;
+	top: 5px;
 	left: 2px;
 	width: 1880px;
 	overflow: auto;
     height: 240px;
     background-color: rgb(31, 31, 31);
-    border-color: rgb(124, 124, 124);
+    border-color: rgb(70, 70, 70);
     border-style: solid;
 	border-width: 4px;
 	border-radius: 8px;
@@ -46,7 +46,7 @@
 }
 
 .chan-strip-body > .vertical-line {
-	background-color:rgb(124, 124, 124);
+	background-color:rgb(70, 70, 70);
 	height: 100%;
 	width: 4px;
 	margin-left: 10px;

diff --git a/src/assets/css/Channels.css b/src/assets/css/Channels.css
@@ -1,9 +1,9 @@
 .channels-body {
-    margin-top: 250px;
     display: flex;
     flex-direction: row;
     background-color: black;
     min-height: 760px;
+    margin-top: 22vh;
 }
 
 .channels-mix-body {

diff --git a/src/components/ChanStrip.tsx b/src/components/ChanStrip.tsx
@@ -236,6 +236,9 @@ class ChanStrip extends React.PureComponent<IChanStripProps & IChanStripInjectPr
     }
     monitor(channelIndex: number) {
         let monitorName = this.props.fader[this.props.channel[channelIndex].assignedFader].label
+        if (monitorName === '') {
+            monitorName = 'Fader ' + String(this.props.channel[channelIndex].assignedFader + 1)
+        }
         return (
             <li key={channelIndex}>
                 {monitorName}

diff --git a/src/reducers/fadersReducer.ts b/src/reducers/fadersReducer.ts
@@ -81,7 +81,7 @@ const defaultFadersReducerState = (numberOfFaders: number) => {
                 high: 0.75,
                 threshold: 0.75,
                 ratio: 0.75,
-                monitor: -1,
+                monitor: (index + 1),
                 showChannel: true,
                 snapOn: [],
             });