Skip to content

Commit 905c648

Browse files
committed
Fix CSS for new graph controls
1 parent 524a550 commit 905c648

File tree

2 files changed

+24
-8
lines changed

2 files changed

+24
-8
lines changed

index.html

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<meta name="author" content="Lykon, Lollo, Neeja, Pastello" />
99
<title>Netkit Lab Generator</title>
1010
<link rel="stylesheet" href="src/static/vendor/css/bootstrap.min.css" />
11+
<link rel="stylesheet" href="src/style/main.css" />
1112
<script src="src/lab-generator/helper.js"></script>
1213
</head>
1314

@@ -20,10 +21,8 @@
2021

2122
<!-- MAIN-->
2223
<div data-ng-app="napp" data-ng-controller="nc">
23-
<link rel="stylesheet" href="src/style/main.css" />
2424
<script src="src/static/vendor/js/angular.min.js"></script>
2525
<script src="src/lab-generator/controller.js"></script>
26-
2726
<!-- NAVBAR-->
2827
<div>
2928
<nav id="main-nav" style="-webkit-app-region: drag"
@@ -593,16 +592,16 @@ <h3>Bash file preview:</h3>
593592
</div>
594593

595594
<!-- GRAPH -->
596-
<div id="graph" class="tab-pane">
595+
<div id="graph" class="tab-pane" style="height: 100%; margin-bottom: 0;">
597596
<script src="src/static/vendor/js/vis.js"></script>
598597
<script src="src/lab-generator/models/draw.js"></script>
599598
<script src="src/lab-generator/make_draw_model.js"></script>
600-
<div id="mynetwork" style="height: 65vh; border: 1px solid lightgray;"></div>
599+
<div id="mynetwork" style="height: calc(100% - 280px); border: 1px solid lightgray;"></div>
601600

602601
<div id="controls"
603-
style="border: 1px solid lightgray; width: 100%; margin-top: 1em; height: 25vh; overflow: scroll;">
602+
style="border: 1px solid lightgray; width: 100%; margin-top: 1em; height: 244px;">
604603
<div class="row" style="margin: 0 !important;">
605-
<div class="col-md-offset-3 col-md-2">
604+
<div class="col-md-offset-2 col-md-3">
606605
<h3 class="margin-bottom: 5px;">Edges smoothness</h3>
607606

608607
<div class="form-group">
@@ -629,7 +628,7 @@ <h3 class="margin-bottom: 5px;">Edges smoothness</h3>
629628
</select>
630629
</div>
631630
</div>
632-
<div class="col-md-2">
631+
<div class="col-md-3">
633632
<h3 class="margin-bottom: 5px;">Physics</h3>
634633

635634
<div class="form-group">
@@ -648,7 +647,7 @@ <h3 class="margin-bottom: 5px;">Physics</h3>
648647
value='-1200' id='physicsGravitationalConstantValue' readonly='true'>
649648
</div>
650649
</div>
651-
<div class="col-md-2">
650+
<div class="col-md-3">
652651
<h3 class="margin-bottom: 5px;">Miscellaneous</h3>
653652

654653
<div class="form-group">

src/style/main.css

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,27 @@
44
--disclaimer-color: rgba(255, 0, 0, .2);
55
}
66

7+
html {
8+
padding: 0;
9+
margin: 0;
10+
height: 100%;
11+
}
12+
713
body {
14+
height: 100%;
15+
padding: 0;
16+
margin: 0;
17+
top: 0;
18+
position: fixed;
19+
width: 100%;
820
padding-top: 45px;
921
}
1022

23+
.ng-scope,
24+
.tab-content {
25+
height: 100%;
26+
}
27+
1128
.anchor-id {
1229
position: absolute;
1330
margin-top: -140px;

0 commit comments

Comments
 (0)