Skip to content

Commit 279d3ef

Browse files
committed
GUI Cleanup
1 parent 5e7dbad commit 279d3ef

4 files changed

Lines changed: 20 additions & 13 deletions

File tree

src/public/component/component.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,10 @@ function _event_onNavigationSelect(event)
358358
url += "?graph=" + JSON.stringify(graph.ToJson());
359359
alert(url);
360360
}
361+
else if (navigation === "_navigation_about")
362+
{
363+
alert("Graph Workbench by Shivan Modha");
364+
}
361365
}
362366
function _event_onMouseDown(event)
363367
{

src/public/index.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
<meta name="theme-color" content="#000000">
88
<link rel="manifest" href="%PUBLIC_URL%/manifest.json">
99
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
10-
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/latest/css/bootstrap.min.css">
10+
<!-- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/latest/css/bootstrap.min.css"> -->
11+
<link rel="stylesheet" href="https://bootswatch.com/sandstone/bootstrap.min.css">
1112
<title>Graph Workbench</title>
1213
</head>
1314

src/src/App.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ class App extends Component
158158
}} />
159159
</InputGroup>
160160
<InputGroup style={{ boxShadow: "none" }}>
161-
<InputGroup.Addon style={{ paddingLeft: 13, paddingRight: 13, borderRadius: 0, }}>r</InputGroup.Addon>
161+
<InputGroup.Addon style={{ borderRadius: 0, }}>r</InputGroup.Addon>
162162
<FormControl type="number" value={element.Object.Vertices[int].R} onChange={(event) =>
163163
{
164164
element.Object.Vertices[int].R = event.target.value;
@@ -167,7 +167,7 @@ class App extends Component
167167
SelectedElement: this.state.SelectedElement
168168
});
169169
}} />
170-
<InputGroup.Addon style={{ paddingLeft: 12, paddingRight: 11 }}>g</InputGroup.Addon>
170+
<InputGroup.Addon style={{ }}>g</InputGroup.Addon>
171171
<FormControl type="number" value={element.Object.Vertices[int].G} onChange={(event) =>
172172
{
173173
element.Object.Vertices[int].G = event.target.value;
@@ -176,7 +176,7 @@ class App extends Component
176176
SelectedElement: this.state.SelectedElement
177177
});
178178
}} />
179-
<InputGroup.Addon style={{ paddingLeft: 12, paddingRight: 11 }}>b</InputGroup.Addon>
179+
<InputGroup.Addon style={{ }}>b</InputGroup.Addon>
180180
<FormControl style={{ borderRadius: 0 }} type="number" value={element.Object.Vertices[int].B} onChange={(event) =>
181181
{
182182
element.Object.Vertices[int].B = event.target.value;
@@ -187,7 +187,7 @@ class App extends Component
187187
}} />
188188
</InputGroup>
189189
<InputGroup.Button>
190-
<Button style={{ height: 68, paddingTop: "60%" }} href="#" bsStyle="danger" onClick={(event) =>
190+
<Button style={{ height: 92, paddingTop: "80%" }} href="#" bsStyle="danger" onClick={(event) =>
191191
{
192192
element.Object.Vertices.splice(int, 1);
193193
window.dispatchEvent(new CustomEvent("_event_rebuild_element_", { detail: {element: element} }));
@@ -662,7 +662,7 @@ class App extends Component
662662
position: "fixed",
663663
top: this.state.NavigationHeight,
664664
width: "100%",
665-
height: window.innerHeight - this.state.NavigationHeight - this.state.BreadHeight,
665+
height: window.innerHeight - this.state.NavigationHeight - this.state.BreadHeight + this.state.BreadHeight,
666666
border: 0,
667667
padding: 0,
668668
margin: 0
@@ -785,7 +785,7 @@ class App extends Component
785785
</Navbar.Header>
786786
{this.NavigationCollapse()}
787787
</Navbar>
788-
<Well bsSize="small" style={{ position: "fixed", top: window.innerHeight - this.state.BreadHeight, width: "100%", borderRadius: 0, boxShadow: "none", textAlign: "right" }} ref={(e) => this.BreadBar = e}>
788+
<Well bsSize="small" style={{ position: "fixed", height: 0, top: window.innerHeight - this.state.BreadHeight + this.state.BreadHeight, width: "100%", borderRadius: 0, boxShadow: "none", textAlign: "right" }} ref={(e) => this.BreadBar = e}>
789789
<div style={{ display: "inline", position: "relative", right: 10 }}>
790790
{this.state.Camera}
791791
</div>

src/src/configuration/navigation.json

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,9 @@
4646
"children": {
4747
"Create": "_navigation_node_create",
4848
"Bulk Create": "_navigation_node_bulkcreate",
49-
"Inspect": "_navigation_node_inspect",
50-
"Remove": "_navigation_node_remove"
49+
"Remove": "_navigation_node_remove",
50+
"div1": "divider",
51+
"Inspect": "_navigation_node_inspect"
5152
}
5253
},
5354
"Element": {
@@ -57,14 +58,15 @@
5758
"id": "nav-element-dropdown",
5859
"children": {
5960
"Create": "_navigation_element_create",
60-
"Inspect": "_navigation_element_inspect",
61-
"Remove": "_navigation_element_remove"
61+
"Remove": "_navigation_element_remove",
62+
"div1": "divider",
63+
"Inspect": "_navigation_element_inspect"
6264
}
6365
},
64-
"Options": {
66+
"About": {
6567
"type": "link",
6668
"side": "right",
67-
"eventKey": "_navigation_options",
69+
"eventKey": "_navigation_about",
6870
"href": "#"
6971
}
7072
}

0 commit comments

Comments
 (0)