Skip to content

Commit f553e70

Browse files
committed
#431 Layout fixes after migration to meta
1 parent 42b60ad commit f553e70

3 files changed

Lines changed: 65 additions & 7 deletions

File tree

webapp/components/instantiation/NetPyNEInstantiated.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import CameraControls from '@metacell/geppetto-meta-ui/camera-controls/CameraCon
77
// import ControlPanel from 'geppetto-client/js/components/interface/controlPanel/controlpanel';
88

99
import { NetWorkControlButtons } from 'netpyne/components';
10-
import { primaryColor, canvasBgDark, canvasBgLight } from '../../theme';
10+
import { primaryColor, canvasBgDark, canvasBgLight, bgRegular } from '../../theme';
1111
import { THEMES } from '../../constants';
1212

1313
const CANVAS_LIGHT = 'canvas-toolbar-btns-light';
@@ -222,7 +222,7 @@ class NetPyNEInstantiated extends React.Component {
222222
cameraOptions={camOptions}
223223
key="CanvasContainer"
224224
data={canvasData}
225-
backgroundColor="#000000"
225+
backgroundColor={bgRegular}
226226
/>
227227
<div id="controlpanel" style={{ top: 0 }}>
228228
{/* TODO: refactor the control panel with the list viewer

webapp/css/flexlayout.less

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,42 @@
11
@import "variables";
22

3-
.flexlayout__layout {
3+
div.flexlayout__layout {
44
border-left: none !important;
55
border-right: none !important;
66
background-color: transparent;
77
top: 0px;
88
border-top: none;
99

10+
.flexlayout__tab_button {
11+
&:hover {
12+
.flexlayout__tab_button_trailing {
13+
background: none;
14+
}
15+
}
16+
17+
&.flexlayout__tab_button--selected {
18+
.flexlayout__tab_button_trailing {
19+
background: none;
20+
}
21+
}
22+
}
23+
24+
.flexlayout__tab_button_top {
25+
box-shadow: none;
26+
}
27+
28+
.flexlayout__tabset_tabbar_outer {
29+
background-color: transparent;
30+
}
31+
32+
.flexlayout__tabset_tabbar_outer_top {
33+
border-bottom: none;
34+
}
35+
36+
.flexlayout__tabset_tabbar_inner_tab_container_top {
37+
border-top: none;
38+
}
39+
1040
a {
1141
color: @colorLink;
1242
}

webapp/css/netpyne.less

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,15 @@ body {
88
font-size: 16px;
99
}
1010

11+
html {
12+
* {
13+
box-sizing: border-box;
14+
}
15+
body {
16+
background: @bgDarker;
17+
}
18+
}
19+
1120
:root {
1221
--m2: 8px;
1322
--m4: 16px;
@@ -142,6 +151,7 @@ button.actionButton {
142151
color: white;
143152
left: 22px;
144153
pointer-events: none;
154+
word-wrap: break-word;
145155
z-index: 10;
146156
}
147157
.breadcrumbButtony button {
@@ -574,17 +584,35 @@ div.flexlayout__layout {
574584
}
575585
}
576586
@-webkit-keyframes spin {
577-
0% { -webkit-transform: rotate(0deg); }
578-
100% { -webkit-transform: rotate(360deg); }
587+
0% {
588+
-webkit-transform: rotate(0deg);
589+
}
590+
100% {
591+
-webkit-transform: rotate(360deg);
592+
}
579593
}
580594

581595
@keyframes spin {
582-
0% { transform: rotate(0deg); }
583-
100% { transform: rotate(360deg); }
596+
0% {
597+
transform: rotate(0deg);
598+
}
599+
100% {
600+
transform: rotate(360deg);
601+
}
584602
}
585603

586604
body {
587605
.MuiTable-root {
588606
border-collapse: separate;
589607
}
590608
}
609+
610+
.instantiatedContainer {
611+
.position-toolbar {
612+
button {
613+
background-color: rgba(255, 255, 255, 0.2);
614+
font-size: 0.875rem;
615+
border-radius: 0;
616+
}
617+
}
618+
}

0 commit comments

Comments
 (0)