Skip to content

Commit

Permalink
feat: Full Ch Strip overall is scaling correct now
Browse files Browse the repository at this point in the history
  • Loading branch information
@olzzon
olzzon committed Dec 4, 2021
1 parent 8ade6da commit 1401a55
Show file tree
Hide file tree
Showing 4 changed files with 102 additions and 102 deletions.
10 changes: 7 additions & 3 deletions client/assets/css/ChanStripEq.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,21 @@
justify-content: space-evenly;
top: 2vh;
left: 2vw;
width: 85vw;
width: 75vw;
height: 10vh;
margin-left: 2vw;
margin-left: 1vw;
margin-top: 2vh;
}

.eq-text-parameters {
max-width: 22vw;
}

.eq-full > .eq-window {
top: 2vh;
left: 2vw;
margin-top: 3vh;
margin-left: 10vw;
margin-left: 4vw;
height: 30vh;
width: 0vw;
}
Expand Down
13 changes: 11 additions & 2 deletions client/assets/css/ChanStripFull.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

.chstrip-full-parameters {
display: flex;
justify-content: space-evenly;
justify-content: left;
top: 2vh;
left: 2vw;
height: 30vh;
Expand All @@ -53,6 +53,7 @@
.chstrip-full-content-group {
display: flex;
flex-direction: column;
margin-right: 2vw;
}

.chstrip-full-content {
Expand Down Expand Up @@ -166,7 +167,15 @@
display: flex;
text-align: center;
margin-top: 2vh;
margin-left: 1vw;
min-width: 20vw;
}

.chstrip-full-monitor-text {
list-style-type: none;
text-align: center;
margin-top: 2vh;
font-size: 1.5vh;
margin-left: -5vw;
}

.ch-strip-full-header > .close {
Expand Down
1 change: 1 addition & 0 deletions client/components/ChanStripEq.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,7 @@ class ChanStripEq extends React.PureComponent<

return (
<div
className="eq-text-parameters"
key={index}
style={{
color: EqColors[fxParamsList[fxKey]],
Expand Down
180 changes: 83 additions & 97 deletions client/components/ChanStripFull.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ class ChanStripFull extends React.PureComponent<
if (faderIndex === -1) return null
let monitorName = getFaderLabel(faderIndex, 'Fader')
return (
<li key={channelIndex}>
<li className="chstrip-full-monitor-text" key={channelIndex}>
{monitorName}
<div className="chstrip-full-mini-text">&nbsp;</div>
<ReactSlider
Expand Down Expand Up @@ -375,112 +375,98 @@ class ChanStripFull extends React.PureComponent<
.CHANNEL_INPUT_SELECTOR
return (
<div className="chstrip-full-parameters">
{hasInput && (
<React.Fragment>
{hasInput && (
<React.Fragment>
<div className="chstrip-full-content-group">
<div className="title">INPUT</div>
<div className="chstrip-full-content">
<div className="title">INPUT</div>
<div className="chstrip-full-content">
{this.inputSelector()}
{this.inputGain()}
</div>
{this.inputSelector()}
{this.inputGain()}
</div>
</React.Fragment>
)}
<React.Fragment>
{this.doesParamExists(fxParamsList.GainTrim) ? (
</div>
</React.Fragment>
)}
<React.Fragment>
{this.doesParamExists(fxParamsList.GainTrim) ? (
<div className="chstrip-full-content-group">
<div className="title">INPUT</div>
<div className="chstrip-full-content">
<div className="title">INPUT</div>
<div className="chstrip-full-content">
{this.fxParamFader(
fxParamsList.GainTrim
)}
</div>
{this.fxParamFader(fxParamsList.GainTrim)}
</div>
) : (
<React.Fragment></React.Fragment>
)}
{this.doesParamExists(fxParamsList.CompThrs) ? (
</div>
) : (
<React.Fragment></React.Fragment>
)}
{this.doesParamExists(fxParamsList.CompThrs) ? (
<div className="chstrip-full-content-group">
<div className="title">COMPRESSOR</div>
<div className="chstrip-full-content">
<div className="title">COMPRESSOR</div>
<div className="chstrip-full-content">
{this.fxParamButton(
fxParamsList.CompOnOff
)}
{this.fxParamFader(
fxParamsList.CompThrs
)}
<p className="chstrip-full-zero-comp">
______
</p>
{this.fxParamFader(
fxParamsList.CompRatio
)}
<p className="chstrip-full-zero-comp">
______
</p>
{this.gainReduction()}
{this.fxParamFader(
fxParamsList.CompMakeUp
)}
<p className="chstrip-full-zero-comp">
______
</p>
{this.fxParamFader(
fxParamsList.CompAttack
)}
<p className="chstrip-full-zero-comp">
______
</p>
{this.fxParamFader(
fxParamsList.CompHold
)}
<p className="chstrip-full-zero-comp">
______
</p>
{this.fxParamFader(
fxParamsList.CompRelease
)}
<p className="chstrip-full-zero-comp">
______
</p>
</div>
{this.fxParamButton(fxParamsList.CompOnOff)}
{this.fxParamFader(fxParamsList.CompThrs)}
<p className="chstrip-full-zero-comp">
______
</p>
{this.fxParamFader(fxParamsList.CompRatio)}
<p className="chstrip-full-zero-comp">
______
</p>
{this.gainReduction()}
{this.fxParamFader(fxParamsList.CompMakeUp)}
<p className="chstrip-full-zero-comp">
______
</p>
{this.fxParamFader(fxParamsList.CompAttack)}
<p className="chstrip-full-zero-comp">
______
</p>
{this.fxParamFader(fxParamsList.CompHold)}
<p className="chstrip-full-zero-comp">
______
</p>
{this.fxParamFader(
fxParamsList.CompRelease
)}
<p className="chstrip-full-zero-comp">
______
</p>
</div>
) : (
<React.Fragment></React.Fragment>
)}
{this.doesParamExists(fxParamsList.DelayTime) ? (
<div className="chstrip-full-content-group">
<div className="title">DELAY</div>
<div className="chstrip-full-content">
{this.delay()}
</div>
</div>
) : (
<React.Fragment></React.Fragment>
)}
{this.doesParamExists(fxParamsList.DelayTime) ? (
<div className="chstrip-full-content-group">
<div className="title">DELAY</div>
<div className="chstrip-full-content">
{this.delay()}
</div>
) : (
<div className="noDelayButtons"></div>
)}
</div>
) : (
<div className="noDelayButtons"></div>
)}
<div className="chstrip-full-content-group">
<div className="title">
{this.props.label}
{' - MONITOR MIX MINUS'}
</div>
<div className="chstrip-full-content">
<div className="title">
{this.props.label}
{' - MONITOR MIX MINUS'}
</div>
<div className="chstrip-full-content">
<ul className="chstrip-full-monitor-sends">
{this.props.channel.map(
(ch: any, index: number) => {
if (
ch.auxLevel[
this.props.auxSendIndex
] >= 0
) {
return this.monitor(index)
}
<ul className="chstrip-full-monitor-sends">
{this.props.channel.map(
(ch: any, index: number) => {
if (
ch.auxLevel[
this.props.auxSendIndex
] >= 0
) {
return this.monitor(index)
}
)}
</ul>
</div>
}
)}
</ul>
</div>
</React.Fragment>
</div>
</div>
</React.Fragment>
</div>
)
} else {
return null
Expand Down

0 comments on commit 1401a55

Please sign in to comment.