7
mirror of https://github.com/EEVengers/ThunderScope.git synced 2025-04-08 06:25:30 +00:00

run/stop/single buttons now on top of sidebar

This commit is contained in:
Jason Bonnell 2021-03-22 12:30:12 -04:00
parent 1459089da8
commit 658d1bf82a
4 changed files with 43 additions and 13 deletions
Software/waveview/src

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>
)
}

View File

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

View File

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

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;
}