Skip to content

Commit d30791a

Browse files
ddelpianoddelpiano
committed
#417 various fixes to the layout
1 parent 8498085 commit d30791a

10 files changed

Lines changed: 58 additions & 68 deletions

File tree

‎webapp/components/drawer/Drawer.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,8 @@ const DrawerList = ({
204204
setTimeout(() => window.dispatchEvent(new Event('resize')), 400);
205205
}}
206206
>
207-
{expand ? <DrawerIcon name="arrow-left" fontSize="inherit" />
208-
: <DrawerIcon name="arrow-right" fontSize="inherit" />}
207+
{expand ? <DrawerIcon style={{ padding: '12px !important' }} name="arrow-left" fontSize="inherit" />
208+
: <DrawerIcon style={{ padding: '12px !important' }} name="arrow-right" fontSize="inherit" />}
209209
</IconButton>
210210
</Tooltip>
211211
</div>

‎webapp/components/drawer/useStyles.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export default makeStyles(({
2525
closeDrawer: drawerCss(false, transitions, palette, spacing),
2626

2727
buttonContainerOpen: { textAlign: 'end' },
28-
buttonContainerClosed: { textAlign: 'center' },
28+
buttonContainerClosed: { textAlign: 'center', padding: '12px' },
2929
button: {
3030
color: 'white',
3131
fontSize: '1em',

‎webapp/components/general/ControlPanelTreeItem.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ const ControlPanelTreeItem = (props) => {
3939
const [color, setColor] = React.useState('#ff0000');
4040

4141
const handleColorSelection = (color, event, nodeId) => {
42+
setColor(color.hex);
4243
event.preventDefault();
4344
event.stopPropagation();
44-
setColor(color.hex);
4545
};
4646

4747
const {

‎webapp/components/instantiation/NetPyNEInstantiated.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,10 @@ class NetPyNEInstantiated extends React.Component {
131131
return (
132132
<div className="instantiatedContainer">
133133
<Canvas
134+
data={canvasData}
134135
ref={this.canvasRef}
135-
cameraOptions={camOptions}
136136
key="CanvasContainer"
137-
data={canvasData}
137+
cameraOptions={camOptions}
138138
backgroundColor={bgRegular}
139139
onSelection={this.onSelection}
140140
/>

‎webapp/css/flexlayout.less‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ div.flexlayout__layout {
8686
background-color: @bgDarker; //color-light
8787
}
8888
.flexlayout__border_inner_bottom {
89+
// position: fixed !important;
90+
// top: 100% !important;
8991
position: fixed;
9092
bottom: -100px;
9193
left: 0;

‎webapp/css/netpyne.less‎

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -46,24 +46,6 @@ html {
4646
top: 0px;
4747
}
4848

49-
#controlpanel {
50-
margin-top: @flexlayout-widget-border;
51-
// top: 0%!important;
52-
// width: 97%!important;
53-
height: calc(100% - 24px) !important;
54-
width: calc(100% - 16px) !important;
55-
div.griddle {
56-
td,
57-
th {
58-
background-color: rgba(@bgLight, 0.7);
59-
}
60-
}
61-
}
62-
#ControlPanelButton {
63-
:hover {
64-
color: @secondaryColor !important;
65-
}
66-
}
6749
button.actionButton {
6850
font-size: 15px;
6951
margin: 10px;
@@ -617,3 +599,7 @@ body {
617599
}
618600
}
619601
}
602+
603+
.bottom_icon {
604+
padding: 12px;
605+
}

‎webapp/redux/reducers/general.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export default function reduceGeneral (state = GENERAL_DEFAULT_STATE, action) {
5252
return { ...state, theme: action.payload };
5353
}
5454
case Actions.CHANGE_INSTANCE_COLOR: {
55-
return { ...state, instances: [...action.instances] };
55+
return { ...state, instances: [...action.data.instance] };
5656
}
5757
case Actions.ADD_CANVAS_INSTANCES: {
5858
return { ...state, instances: [...state.instances, ...action.instances] };

‎webapp/update-geppetto-ui.sh‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,8 @@ yarn && yarn build:dev && yarn publish:yalc
1717

1818
cd $app/
1919

20+
yalc add @metacell/geppetto-meta-client
21+
yalc add @metacell/geppetto-meta-core
22+
yalc add @metacell/geppetto-meta-ui
23+
2024
yarn
21-
yarn run start

‎webapp/yalc.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
"version": "v1",
33
"packages": {
44
"@metacell/geppetto-meta-client": {
5-
"signature": "76b4ff460a6493b5c18b286c84364673",
5+
"signature": "9189795eefe9451f437274f6bae6fd84",
66
"file": true
77
},
88
"@metacell/geppetto-meta-core": {
9-
"signature": "7a6d29eedb3eef09a122aaf65973490e",
9+
"signature": "5151317afcaa8e7cb590e0fc4cf90f00",
1010
"file": true
1111
},
1212
"@metacell/geppetto-meta-ui": {
13-
"signature": "97b9fc1702c553365226f12053b9e87b",
13+
"signature": "210075d0d76db15d9c0ead02e200e2e3",
1414
"file": true
1515
}
1616
}

‎webapp/yarn.lock‎

Lines changed: 38 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@
33

44

55
"@ampproject/remapping@^2.0.0":
6-
version "2.0.2"
7-
resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.0.2.tgz#f3d9760bf30588c51408dbe7c05ff2bb13069307"
8-
integrity sha512-sE8Gx+qSDMLoJvb3QarJJlDQK7SSY4rK3hxp4XsiANeFOmjU46ZI7Y9adAQRJrmbz8zbtZkp3mJTT+rGxtF0XA==
6+
version "2.1.0"
7+
resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.1.0.tgz#72becdf17ee44b2d1ac5651fb12f1952c336fe23"
8+
integrity sha512-d5RysTlJ7hmw5Tw4UxgxcY3lkMe92n8sXCcuLPAyIAHK6j8DefDwtGnVVDgOnv+RnEosulDJ9NPKQL27bDId0g==
99
dependencies:
10-
"@jridgewell/trace-mapping" "^0.2.2"
11-
sourcemap-codec "1.4.8"
10+
"@jridgewell/trace-mapping" "^0.3.0"
1211

1312
"@babel/code-frame@7.12.11":
1413
version "7.12.11"
@@ -1075,13 +1074,18 @@
10751074
resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.4.tgz#b876e3feefb9c8d3aa84014da28b5e52a0640d72"
10761075
integrity sha512-cz8HFjOFfUBtvN+NXYSFMHYRdxZMaEl0XypVrhzxBgadKIXhIkRd8aMeHhmF56Sl7SuS8OnUpQ73/k9LE4VnLg==
10771076

1078-
"@jridgewell/trace-mapping@^0.2.2":
1079-
version "0.2.6"
1080-
resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.2.6.tgz#5eac4bea1b56e073471c6f021582bdb986c4b8b7"
1081-
integrity sha512-rVJf5dSMEBxnDEwtAT5x8+p6tZ+xU6Ocm+cR1MYL2gMsRi4MMzVf9Pvq6JaxIsEeKAyYmo2U+yPQN4QfdTfFnA==
1077+
"@jridgewell/sourcemap-codec@^1.4.10":
1078+
version "1.4.10"
1079+
resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.10.tgz#baf57b4e2a690d4f38560171f91783656b7f8186"
1080+
integrity sha512-Ht8wIW5v165atIX1p+JvKR5ONzUyF4Ac8DZIQ5kZs9zrb6M8SJNXpx1zn04rn65VjBMygRoMXcyYwNK0fT7bEg==
1081+
1082+
"@jridgewell/trace-mapping@^0.3.0":
1083+
version "0.3.2"
1084+
resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.2.tgz#e051581782a770c30ba219634f2019241c5d3cde"
1085+
integrity sha512-9KzzH4kMjA2XmBRHfqG2/Vtl7s92l6uNDd0wW7frDE+EUvQFGqNXhWp0UGJjSkt3v2AYjzOZn1QO9XaTNJIt1Q==
10821086
dependencies:
10831087
"@jridgewell/resolve-uri" "^3.0.3"
1084-
sourcemap-codec "1.4.8"
1088+
"@jridgewell/sourcemap-codec" "^1.4.10"
10851089

10861090
"@material-ui/core@4.11.4":
10871091
version "4.11.4"
@@ -1184,13 +1188,13 @@
11841188
react-is "^16.8.0 || ^17.0.0"
11851189

11861190
"@metacell/geppetto-meta-client@file:.yalc/@metacell/geppetto-meta-client":
1187-
version "1.0.0-alpha1"
1191+
version "1.0.0-rc3"
11881192

11891193
"@metacell/geppetto-meta-core@file:.yalc/@metacell/geppetto-meta-core":
1190-
version "1.0.0-alpha1"
1194+
version "1.0.0-rc3"
11911195

11921196
"@metacell/geppetto-meta-ui@file:.yalc/@metacell/geppetto-meta-ui":
1193-
version "1.0.0-alpha1"
1197+
version "1.0.0-rc3"
11941198
dependencies:
11951199
babel-plugin-import-less "^0.1.6"
11961200

@@ -1407,9 +1411,9 @@
14071411
integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
14081412

14091413
"@types/node@*":
1410-
version "17.0.14"
1411-
resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.14.tgz#33b9b94f789a8fedd30a68efdbca4dbb06b61f20"
1412-
integrity sha512-SbjLmERksKOGzWzPNuW7fJM7fk3YXVTFiZWB/Hs99gwhk+/dnrQRPBQjPW9aO+fi1tAffi9PrwFvsmOKmDTyng==
1414+
version "17.0.15"
1415+
resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.15.tgz#97779282c09c09577120a2162e71d8380003590a"
1416+
integrity sha512-zWt4SDDv1S9WRBNxLFxFRHxdD9tvH8f5/kg5/IaLFdnSNXsDY4eL3Q3XXN+VxUnWIhyVFDwcsmAprvwXoM/ClA==
14131417

14141418
"@types/prop-types@*":
14151419
version "15.7.4"
@@ -1687,9 +1691,9 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4:
16871691
uri-js "^4.2.2"
16881692

16891693
ajv@^8.0.1:
1690-
version "8.9.0"
1691-
resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.9.0.tgz#738019146638824dea25edcf299dcba1b0e7eb18"
1692-
integrity sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==
1694+
version "8.10.0"
1695+
resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.10.0.tgz#e573f719bd3af069017e3b66538ab968d040e54d"
1696+
integrity sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==
16931697
dependencies:
16941698
fast-deep-equal "^3.1.1"
16951699
json-schema-traverse "^1.0.0"
@@ -1927,9 +1931,9 @@ awesome-typescript-loader@^5.2.1:
19271931
webpack-log "^1.2.0"
19281932

19291933
axe-core@^4.3.5:
1930-
version "4.4.0"
1931-
resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.4.0.tgz#f93be7f81017eb8bedeb1859cc8092cc918d2dc8"
1932-
integrity sha512-btWy2rze3NnxSSxb7LtNhPYYFrRoFBfjiGzmSc/5Hu47wApO2KNXjP/w7Nv2Uz/Fyr/pfEiwOkcXhDxu0jz5FA==
1934+
version "4.4.1"
1935+
resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.4.1.tgz#7dbdc25989298f9ad006645cd396782443757413"
1936+
integrity sha512-gd1kmb21kwNuWr6BQz8fv6GNECPBnUasepcoLbekws23NVBLODdsClRZ+bQ8+9Uomf3Sm3+Vwn0oYG9NvwnJCw==
19331937

19341938
axobject-query@^2.2.0:
19351939
version "2.2.0"
@@ -2427,9 +2431,9 @@ camelcase@^5.0.0, camelcase@^5.3.1:
24272431
integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
24282432

24292433
caniuse-lite@^1.0.30001286:
2430-
version "1.0.30001307"
2431-
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001307.tgz#27a67f13ebc4aa9c977e6b8256a11d5eafb30f27"
2432-
integrity sha512-+MXEMczJ4FuxJAUp0jvAl6Df0NI/OfW1RWEE61eSmzS7hw6lz4IKutbhbXendwq8BljfFuHtu26VWsg4afQ7Ng==
2434+
version "1.0.30001309"
2435+
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001309.tgz#e0ee78b9bec0704f67304b00ff3c5c0c768a9f62"
2436+
integrity sha512-Pl8vfigmBXXq+/yUz1jUwULeq9xhMJznzdc/xwl4WclDAuebcTHVefpz8lE/bMI+UN7TOkSSe7B7RnZd6+dzjA==
24332437

24342438
casperjs@^1.1.4:
24352439
version "1.1.4"
@@ -3179,9 +3183,9 @@ ee-first@1.1.1:
31793183
integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
31803184

31813185
electron-to-chromium@^1.4.17:
3182-
version "1.4.64"
3183-
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.64.tgz#8b1b5372f77ca208f2c498c6490da0e51176bd81"
3184-
integrity sha512-8mec/99xgLUZCIZZq3wt61Tpxg55jnOSpxGYapE/1Ma9MpFEYYaz4QNYm0CM1rrnCo7i3FRHhbaWjeCLsveGjQ==
3186+
version "1.4.65"
3187+
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.65.tgz#c0820db06e268e0a2fd4dbce38fb5376d38ca449"
3188+
integrity sha512-0/d8Skk8sW3FxXP0Dd6MnBlrwx7Qo9cqQec3BlIAlvKnrmS3pHsIbaroEi+nd0kZkGpQ6apMEre7xndzjlEnLw==
31853189

31863190
elliptic@^6.5.3:
31873191
version "6.5.4"
@@ -5436,9 +5440,9 @@ minimalistic-crypto-utils@^1.0.1:
54365440
integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
54375441

54385442
minimatch@^3.0.0, minimatch@^3.0.4:
5439-
version "3.0.4"
5440-
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
5441-
integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
5443+
version "3.0.5"
5444+
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.5.tgz#4da8f1290ee0f0f8e83d60ca69f8f134068604a3"
5445+
integrity sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==
54425446
dependencies:
54435447
brace-expansion "^1.1.7"
54445448

@@ -7193,11 +7197,6 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
71937197
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
71947198
integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
71957199

7196-
sourcemap-codec@1.4.8:
7197-
version "1.4.8"
7198-
resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
7199-
integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
7200-
72017200
spdy-transport@^3.0.0:
72027201
version "3.0.0"
72037202
resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31"
@@ -7697,9 +7696,9 @@ uglify-js@3.4.x:
76977696
source-map "~0.6.1"
76987697

76997698
uglify-js@^3.1.4:
7700-
version "3.15.0"
7701-
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.15.0.tgz#2d6a689d94783cab43975721977a13c2afec28f1"
7702-
integrity sha512-x+xdeDWq7FiORDvyIJ0q/waWd4PhjBNOm5dQUOq2AKC0IEjxOS66Ha9tctiVDGcRQuh69K7fgU5oRuTK4cysSg==
7699+
version "3.15.1"
7700+
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.15.1.tgz#9403dc6fa5695a6172a91bc983ea39f0f7c9086d"
7701+
integrity sha512-FAGKF12fWdkpvNJZENacOH0e/83eG6JyVQyanIJaBXCN1J11TUQv1T1/z8S+Z0CG0ZPk1nPcreF/c7lrTd0TEQ==
77037702

77047703
unbox-primitive@^1.0.1:
77057704
version "1.0.1"

0 commit comments

Comments
 (0)