feat: CCG v2 show- PFL in settings replaces CUE NEXT

olzzon · Jan 27, 2020 · 9a24def · 9a24def
1 parent 53bd70e
commit 9a24def
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 26 deletions.
diff --git a/client/assets/css/Channel.css b/client/assets/css/Channel.css
@@ -97,27 +97,6 @@
     background-color: rgb(163, 106, 0);
 }
 
-.channel-pfl-button {
-    outline : none;
-    -moz-outline : none;
-    margin-left: 3px;
-    margin-right: 3px;
-    margin-top: 5px;
-    color: white;
-    height: 90px;
-    width: 80px;
-    background-color: rgb(9, 0, 59);
-    border-radius: 7px;
-    border-color: rgb(99, 99, 99);
-}
-
-.channel-pfl-button.on {
-    background-color: rgb(17, 0, 255);
-    animation: 2s pfl-active-flash;
-    animation-direction: normal;
-    animation-iteration-count: infinite;
-}
-
 .channel-mute-button {
     outline : none;
     -moz-outline : none;

diff --git a/client/components/Channel.tsx b/client/components/Channel.tsx
@@ -193,7 +193,7 @@ class Channel extends React.Component<IChannelProps & IChannelInjectProps & Stor
     pflButton = () => {
         return (
             <button
-                className={ClassNames("channel-pfl-button", {
+                className={ClassNames("channel-pst-button", {
                     'on': this.props.fader.pflOn
                 })}
                 onClick={event => {
@@ -262,10 +262,13 @@ class Channel extends React.Component<IChannelProps & IChannelInjectProps & Stor
                     </React.Fragment>
                     : null
                 }
-                <React.Fragment>
-                    {this.pstButton()}
-                    <br/>
-                </React.Fragment>
+                {!this.props.settings.showPfl ?
+                    <React.Fragment>
+                        {this.pstButton()}
+                        <br/>
+                    </React.Fragment>
+                    : null
+                }
                 {this.props.settings.showPfl ?
                     <React.Fragment>
                         {this.pflButton()}