Skip to content

Commit

Permalink
fix: Colors for active faders was missing after converting to react-s…
Browse files Browse the repository at this point in the history
…lider based faders
  • Loading branch information
olzzon committed Oct 21, 2019
1 parent 48f662a commit 15e34f3
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 9 deletions.
32 changes: 24 additions & 8 deletions src/assets/css/Channel.css
Original file line number Diff line number Diff line change
Expand Up @@ -204,17 +204,33 @@
}

.channel-volume-thumb {
margin-left: -19px;
width: 45px;
height: 70px;
background-color: red;
border-color: #c5c2c2;
border-width: 1px;
border-style: solid;
margin-left: -21px;
width: 49px;
height: 75px;
border: 1px solid #c5c2c2;
border-radius: 8px;
background: linear-gradient(to top, #3a3a3a 0%, #c2c2c2 20%, hsl(0, 0%, 57%) 50%, #00a 1px, #919191 52%, #c2c2c2 80%, #3a3a3a 100%);
}

.channel-volume-thumb-color-pgm {
margin-left: -21px;
width: 49px;
height: 75px;
border: 1px solid rgb(253, 60, 60);
border-radius: 8px;
background: linear-gradient(to top, #3a3a3a 0%, #c2c2c2 20%, #919191 50%, #00a 1px, #919191 52%, #c2c2c2 80%, #3a3a3a 100%);
background: linear-gradient(to top, #3a1d1d 0%, #c04d4d 20%, #811919 50%, #00a 1px, #8a2626 52%, #bd5151 80%, #411f1f 100%);
}

.channel-volume-thumb-color-vo {
margin-left: -21px;
width: 49px;
height: 75px;
border: 1px solid rgb(252, 255, 86);
border-radius: 8px;
background: linear-gradient(to top, #353006 0%, #c59327 20%, #856b14 50%, #00a 1px, #866724 52%, #cca22d 80%, #463b0a 100%);
}


:focus {
outline: 0;
}
Expand Down
3 changes: 2 additions & 1 deletion src/components/Channel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,11 @@ class Channel extends React.Component<IChannelProps & IChannelInjectProps & Stor
}

fader() {
let thumb = 'channel-volume-thumb' + (this.props.pgmOn ? '-color-pgm' : '') + (this.props.voOn ? '-color-vo' : '')
return (
<ReactSlider
className="channel-volume-fader"
thumbClassName="channel-volume-thumb"
thumbClassName = { thumb }
orientation="vertical"
invert
min={0}
Expand Down

0 comments on commit 15e34f3

Please sign in to comment.