Skip to content

Commit

Permalink
bootstrap and jquery updated
Browse files Browse the repository at this point in the history
  • Loading branch information
M-Wicenec committed Jul 30, 2021
1 parent e649a3f commit a1c8c8c
Show file tree
Hide file tree
Showing 10 changed files with 31 additions and 36 deletions.
2 changes: 1 addition & 1 deletion daliuge-engine/dlg/manager/web/dim.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<script src="/static/js/d3/d3.v5.min.js"></script>
<script src="/static/js/dm.js"></script>
<script src="/static/js/jquery.min.js"></script>
<script src="/static/js/bootstrap.min.js"></script>
<script src="/static/js/bootstrap.bundle.min.js"></script>
<script src="/static/js/bootbox.min.js"></script>
<link href="/static/css/bootstrap.min.css" rel="stylesheet" type="text/css"/>
<link href="/static/css/dm.css" rel="stylesheet" type="text/css"/>
Expand Down
2 changes: 1 addition & 1 deletion daliuge-engine/dlg/manager/web/dm.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<script src="/static/js/d3/d3.v5.min.js"></script>
<script src="/static/js/dm.js"></script>
<script src="/static/js/jquery.min.js"></script>
<script src="/static/js/bootstrap.min.js"></script>
<script src="/static/js/bootstrap.bundle.min.js"></script>
<script src="/static/js/bootbox.min.js"></script>
<link href="/static/css/bootstrap.min.css" rel="stylesheet" type="text/css"/>
<link href="/static/css/dm.css" rel="stylesheet" type="text/css"/>
Expand Down
8 changes: 4 additions & 4 deletions daliuge-engine/dlg/manager/web/session.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<link rel="shortcut icon" type="image/svg" href="static/icons/liuFavIcon.svg"/>
<script src="/static/js/d3/d3.v5.min.js"></script>
<script src="/static/js/d3/dagre-d3.min.js"></script>
<script src="/static/js/jquery-1.11.3.min.js"></script>
<script src="/static/js/jquery.min.js"></script>
<script src="/static/js/bootstrap.bundle.min.js"></script>
<script src="/static/js/bootbox.min.js"></script>
<script src="/static/js/dm.js"></script>
Expand Down Expand Up @@ -46,10 +46,10 @@
<button type="button" value="TB" class="btn btn-secondary tooltip tooltipBottom" data-text="Display Graph From Top to Bottom"><span class="fa fa-arrows-v"> </span></button>
</div>
</ul>
<ul class="nav navbar-nav ml-auto">
<button id="cancelBtn" type="button" class="btn btn-secondary">Cancel Session</button>
<ul class="nav navbar-nav navbar-right">
<button id="cancelBtn" type="button" class="btn btn-secondary">Cancel Session</button>
<button disabled class="btn btn-secondary" id="session-status-wrapper" >Status: <span id="session-status"></span></button>
</ul>
</ul>
</div>
</nav>
<div id="graphNameWrapper">
Expand Down
12 changes: 6 additions & 6 deletions daliuge-engine/dlg/manager/web/static/css/bootstrap.min.css

Large diffs are not rendered by default.

This file was deleted.

6 changes: 5 additions & 1 deletion daliuge-engine/dlg/manager/web/static/css/dm.css
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
width: 100%;
height:auto;
background-color: #002349;
padding: 0px 16px;
padding: 0px 20px;
position: fixed;
z-index: 101;
}
Expand All @@ -38,6 +38,10 @@ background: linear-gradient(90deg, rgba(0,64,133,1) 0%, rgba(0,52,107,1) 20%, rg
margin-bottom:100px;
}

.navbar-brand{
margin-left: 20px;
}

.navbar-brand span{
margin-left: 10px;
}
Expand Down
12 changes: 10 additions & 2 deletions daliuge-engine/dlg/manager/web/static/css/session.css
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ svg {
width: 100%;
height:auto;
background-color: #002349;
padding: 0px 16px;
padding: 0px 20px;
position: fixed;
z-index: 101;
}
Expand All @@ -117,6 +117,10 @@ svg {
margin-bottom:100px;
}

.navbar-brand{
margin-left: 20px;
}

.navbar-brand span{
margin-left: 10px;
text-decoration: underline;
Expand All @@ -132,6 +136,11 @@ svg {
margin-right:10px;
}

.navbar-nav.navbar-right {
position: absolute;
right:10px;
}

.navbar-nav button {
background-color: transparent;
border:1px white solid;
Expand All @@ -154,7 +163,6 @@ svg {
color:white;
background-color: transparent;
opacity: 100%;
margin-right:20px;
}

#session-status{
Expand Down

Large diffs are not rendered by default.

7 changes: 0 additions & 7 deletions daliuge-engine/dlg/manager/web/static/js/bootstrap.min.js

This file was deleted.

5 changes: 0 additions & 5 deletions daliuge-engine/dlg/manager/web/static/js/jquery-1.11.3.min.js

This file was deleted.

0 comments on commit a1c8c8c

Please sign in to comment.