AllSpiceMirrors/ThunderScope
7
Fork 0
mirror of https://github.com/EEVengers/ThunderScope.git synced 2025-04-14 23:59:19 +00:00
Files Issues Releases Activity

Merge pull request from EEVengers/features/keep-core-buttons-static

Browse Source 
Features/keep core buttons static
This commit is contained in:
Jason Bonnell 2021-03-22 12:55:25 -04:00 committed by GitHub
commit 3c4729df5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 63 additions and 13 deletions

20
Software/waveview/src/components/sidebar/sidebar.tsx
View File

@ -12,14 +12,18 @@ class SideBar extends React.Component {
render() {
return (
<div className="SideBarComponent">
<RunStopButton />
<SingleButton />
<HorizontalWidget />
<VerticalWidget />
<TriggerWidget />
<MathWidget />
<MeasurementsWidget />
<div className="SideBar">
<div className="CoreButtonsComponent">
<RunStopButton />
<SingleButton />
</div>
<div className="SideBarComponent">
<HorizontalWidget />
<VerticalWidget />
<TriggerWidget />
<MathWidget />
<MeasurementsWidget />
</div>
</div>
)
}

2
Software/waveview/src/css/sidebar/core/runStopButton.css
View File

@ -2,7 +2,7 @@
display: flex;
flex-direction: column;
position: relative;
top: 1vh;
top: 0;
width: 7vw;
height: 2vh;
color: black;

2
Software/waveview/src/css/sidebar/core/singleButton.css
View File

@ -2,7 +2,7 @@
display: flex;
flex-direction: column;
position: relative;
top: -1vh;
top: -2vh;
left: 8vw;
width: 7vw;
height: 2vh;

32
Software/waveview/src/css/sidebar/sidebar.css
View File

@ -1,16 +1,42 @@
.SideBar {
text-align: center;
flex-direction: column;
display: flex;
}
.SideBarComponent {
position: fixed;
right: 0;
width: 15vw;
height: 100vh;
color: white;
background: #2E2E2E;
z-index: 101;
overflow-y: scroll;
overflow-x: hidden;
}
.CoreButtonsComponent {
display: flex;
flex-direction: column;
position: relative;
right: 0;
width: 15vw;
height: 2vh;
color: white;
background: #2E2E2E;
z-index: 100;
overflow-y: hidden;
overflow-x: hidden;
}
.SideBarComponent {
display: flex;
flex-direction: column;
position: relative;
right: 0;
width: 15vw;
height: 100vh;
color: white;
background: #2E2E2E;
z-index: 101;
overflow-y: scroll;
overflow-x: hidden;
}

3
Software/waveview/src/css/sidebar/widgets/horizontalWidget.css
View File

@ -9,6 +9,7 @@
background-color: #4B4B4B;
color: black;
margin: 10px;
font-weight: bolder;
}
.TimeBaseTitle {
@ -18,6 +19,7 @@
margin-right: 50px;
font-size: small;
margin-bottom: 1vh;
font-weight: bold;
}
.HorizontalOffsetTitle {
@ -27,6 +29,7 @@
margin-right: 50px;
font-size: small;
margin-top: 1vh;
font-weight: bold;
}
.CourseControlButton {

4
Software/waveview/src/css/sidebar/widgets/mathWidget.css
View File

@ -18,6 +18,7 @@
margin-right: 50px;
font-size: small;
margin-bottom: 1vh;
font-weight: bold;
}
.Channel1Title {
@ -28,6 +29,7 @@
font-size: small;
margin-bottom: 1vh;
margin-top: 1vh;
font-weight: bold;
}
.Channel2Title {
@ -38,6 +40,7 @@
font-size: small;
margin-bottom: 1vh;
margin-top: 1vh;
font-weight: bold;
}
.OperatorTitle {
@ -48,4 +51,5 @@
font-size: small;
margin-bottom: 1vh;
margin-top: 1vh;
font-weight: bold;
}

4
Software/waveview/src/css/sidebar/widgets/measurementsWidget.css
View File

@ -14,6 +14,7 @@
font-size: small;
margin-top: 1vh;
margin-bottom: 1vh;
font-weight: bold;
}
.Channel1Measurements {
@ -49,6 +50,7 @@
font-size: small;
margin-top: 1vh;
margin-bottom: 1vh;
font-weight: bold;
}
.Channel2Measurements {
@ -84,6 +86,7 @@
font-size: small;
margin-top: 1vh;
margin-bottom: 1vh;
font-weight: bold;
}
.Channel3Measurements {
@ -119,6 +122,7 @@
font-size: small;
margin-top: 1vh;
margin-bottom: 1vh;
font-weight: bold;
}
.Channel4Measurements {

3
Software/waveview/src/css/sidebar/widgets/triggerWidget.css
View File

@ -26,6 +26,7 @@
margin-left: 50px;
margin-right: 50px;
font-size: small;
font-weight: bold;
}
.TriggerModeTitle {
@ -36,6 +37,7 @@
font-size: small;
margin-top: 1vh;
margin-bottom: 1vh;
font-weight: bold;
}
.TriggerLevelTitle {
@ -45,6 +47,7 @@
margin-right: 50px;
font-size: small;
margin-top: 1vh;
font-weight: bold;
}
.NanoVoltButtonText {

6
Software/waveview/src/css/sidebar/widgets/verticalWidget.css
View File

@ -41,6 +41,7 @@
margin-right: 50px;
font-size: small;
margin-bottom: 1vh;
font-weight: bold;
}
.Channel1ButtonText {
@ -67,6 +68,7 @@
font-size: small;
margin-top: 1vh;
margin-bottom: 1vh;
font-weight: bold;
}
.CourseControlButton {
@ -92,6 +94,7 @@
margin-right: 50px;
font-size: small;
margin-top: 1vh;
font-weight: bold;
}
.CouplingTitle {
@ -102,6 +105,7 @@
font-size: small;
margin-top: 1vh;
margin-bottom: 1vh;
font-weight: bold;
}
.ProbeTitle {
@ -112,6 +116,7 @@
font-size: small;
margin-top: 1vh;
margin-bottom: 1vh;
font-weight: bold;
}
.BandwidthTitle {
@ -122,4 +127,5 @@
font-size: small;
margin-top: 1vh;
margin-bottom: 1vh;
font-weight: bold;
}