Skip to content

Commit 1dd3329

Browse files
committed
add header
1 parent 24f9db5 commit 1dd3329

File tree

4 files changed

+34
-28
lines changed

4 files changed

+34
-28
lines changed

src/Content.re

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ let make = (~state: State.t, ~display: GvDisplay.t, ~dispatch) => {
88
| _ => None
99
};
1010

11-
<div className="d-flex flex-column h-75 overflow-auto p-2">
11+
<div className="d-flex flex-column h-75 overflow-auto p-4">
1212
<GvBreadcrumb display={state.display} dispatch />
1313
{switch display {
1414
| File(file) =>

src/Main.re

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -49,30 +49,33 @@ let make = (~cil, ~goblint, ~warnings, ~meta, ~stats, ~file_loc) => {
4949
);
5050

5151
<div className="container-fluid">
52-
<div className="row">
53-
<div className="col-2 border-end vh-100">
54-
<SidebarLeft
55-
active={state.selected_sidebar_left}
52+
<header className="navbar navbar-dark fixed-top bg-dark flex-md-nowrap shadow p-1">
53+
<div className="navbar-brand mx-2" >{React.string("Gobview")}</div>
54+
</header>
55+
<div className="main row vh-100">
56+
<div className="col-2 border-end overflow-auto bg-light py-2 h-100">
57+
<SidebarLeft
58+
active={state.selected_sidebar_left}
59+
dispatch
60+
search={state.search}
61+
cil={state.cil}
62+
/>
63+
</div>
64+
<div className="col-7 d-flex flex-column">
65+
{switch (state.display) {
66+
| None => <div className="d-flex flex-column h-75 overflow-auto p-4" />
67+
| Some(f) => <Content state display=f dispatch />
68+
}}
69+
<Panel state dispatch />
70+
</div>
71+
<div className="col-3 border-start overflow-auto py-2 h-100">
72+
<SidebarRight
73+
active={state.selected_sidebar_right}
74+
goblint
75+
inspect={state.inspect}
5676
dispatch
57-
search={state.search}
58-
cil={state.cil}
5977
/>
60-
</div>
61-
<div className="col-8 d-flex flex-column vh-100 p-0">
62-
{switch (state.display) {
63-
| None => <div className="d-flex flex-column h-75 overflow-auto p-2" />
64-
| Some(f) => <Content state display=f dispatch />
65-
}}
66-
<Panel state dispatch />
67-
</div>
68-
<div className="col-2 border-start overflow-auto vh-100">
69-
<SidebarRight
70-
active={state.selected_sidebar_right}
71-
goblint
72-
inspect={state.inspect}
73-
dispatch
74-
/>
75-
</div>
7678
</div>
79+
</div>
7780
</div>;
7881
};

src/SidebarLeft.re

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ let views = [
77
(SelectedSidebar.Search, "Search"),
88
];
99

10-
let make_nav = (active, dispatch) => {
10+
let make_tabs = (active, dispatch) => {
1111
let on_click = (act, _) => Option.may(dispatch, act);
1212

1313
<ul className="nav nav-tabs">
@@ -27,8 +27,8 @@ let make_nav = (active, dispatch) => {
2727

2828
[@react.component]
2929
let make = (~active, ~dispatch, ~search, ~cil) => {
30-
<>
31-
{make_nav(active, dispatch)}
30+
<div>
31+
{make_tabs(active, dispatch)}
3232
<div className="tab-content">
3333
<div className="tab-pane active">
3434
{switch (active) {
@@ -38,5 +38,5 @@ let make = (~active, ~dispatch, ~search, ~cil) => {
3838
}}
3939
</div>
4040
</div>
41-
</>;
41+
</div>;
4242
};

src/stylesheet.scss

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ ul,
7575

7676
.filebox {
7777
background-color: #f5f2f0;
78-
padding: 10px;
7978
}
8079

8180
.filebox h3 {
@@ -185,3 +184,7 @@ ol, ul {
185184
text-decoration: underline;
186185
cursor: pointer;
187186
}
187+
188+
.main {
189+
padding-top: 48px;
190+
}

0 commit comments

Comments
 (0)