Commit 8d4f456c authored by Patrick Godwin's avatar Patrick Godwin

modify templates, css so that button changes are less intrusive

parent 97207e89
Pipeline #78979 passed with stages
in 2 minutes and 10 seconds
......@@ -65,10 +65,9 @@ body {
.navbar {
min-height: 20px;
max-height: 50px;
background: rgba(236, 240, 241, 0.9);
}
.btn {
.online {
background: rgba(236, 240, 241, 0.9);
}
......
......@@ -22,12 +22,12 @@
<div role="tablist">
<b-card no-body class="mb-1">
<b-card-header header-tag="header" class="p-1" role="tab">
<b-button block href="#" class="text-left" v-b-toggle.accordion-{{ div_suffix }}>{{ c['title'] }}</b-button>
<b-button block href="#" class="text-left" variant="secondary" v-b-toggle.accordion-{{ div_suffix }}>{{ c['title'] }}</b-button>
</b-card-header>
% if c['visible']:
<b-collapse id="accordion-{{ div_suffix }}" visible accordion="{{ div_suffix }}-accordion" role="tabpanel">
<b-collapse id="accordion-{{ div_suffix }}" visible accordion="{{ div_suffix }}-accordion" role="tabpanel" variant="secondary">
% else:
<b-collapse id="accordion-{{ div_suffix }}" accordion="{{ div_suffix }}-accordion" role="tabpanel">
<b-collapse id="accordion-{{ div_suffix }}" accordion="{{ div_suffix }}-accordion" role="tabpanel" variant="secondary">
% end
<b-card-body>
<b-container fluid class="bv-{{ div_suffix }}">
......@@ -68,7 +68,7 @@
<b-container fluid class="bv-{{ div_suffix }}">
<div id="table_{{ div_suffix }}">
<div>
<b-table striped hover show-empty responsive
<b-table hover bordered show-empty responsive head-variant="light"
:items="items['{{ c['url'] }}']"
:fields="fields['{{ c['url'] }}']"
:current-page="currentPage['{{ c['url'] }}']"
......
<nav class="navbar fixed-top navbar-expand-lg py-0">
<nav class="navbar online fixed-top navbar-expand-lg py-0">
<!-- add logo/title -->
% if 'image' in dashboard_config:
......@@ -42,12 +42,12 @@
<!-- lock/unlock -->
<span v-if="analysis" title="Unlock Grid Layout">
<b-button class="ml-1 mr-1 border rounded border-secondary" size="sm" variant="light" :pressed.sync="analysis">
<b-button class="online ml-1 mr-1 border rounded border-secondary" size="sm" variant="light" :pressed.sync="analysis">
<i class="fas fa-lock"></i>
</b-button>
</span>
<span v-else title="Lock Grid Layout">
<b-button class="ml-1 mr-1 border rounded border-secondary" size="sm" variant="light" :pressed.sync="analysis">
<b-button class="online ml-1 mr-1 border rounded border-secondary" size="sm" variant="light" :pressed.sync="analysis">
<i class="fas fa-unlock"></i>
</b-button>
</span>
......@@ -76,7 +76,7 @@
<!-- time selection -->
<span title="Decrease Duration">
<b-button class="mx-1 border rounded border-secondary" size="sm" variant="light" v-on:click="decreaseTime">
<b-button class="online mx-1 border rounded border-secondary" size="sm" variant="light" v-on:click="decreaseTime">
<i class="fas fa-angle-left"></i>
</b-button>
</span>
......@@ -84,7 +84,7 @@
<b-form-select class="border rounded border-secondary" size="sm" v-model="form.lookback" :options="options"></b-form-select>
</div>
<span title="Increase Duration">
<b-button class="mx-1 border rounded border-secondary" size="sm" variant="light" v-on:click="increaseTime">
<b-button class="online mx-1 border rounded border-secondary" size="sm" variant="light" v-on:click="increaseTime">
<i class="fas fa-angle-right"></i>
</b-button>
</span>
......@@ -158,7 +158,7 @@
</b-form-group>
<b-button size="sm" class="mr-4" variant="outline-success" type="submit">Go</b-button>
<b-button size="sm" class="online mr-4" variant="outline-success" type="submit">Go</b-button>
</b-form>
......
......@@ -10,7 +10,7 @@
<!-- Dependencies -->
<!-- CSS -->
<link type="text/css" rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/css/bootstrap.min.css" />
<link type="text/css" rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-vue@2.0.0-rc.27/dist/bootstrap-vue.min.css" />
<link type="text/css" rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-vue@2.0.0/dist/bootstrap-vue.min.css" />
<link href="static/scald.css" rel="stylesheet" type="text/css" />
% if 'css' in config:
<link href="{{ config['css'] }}" rel="stylesheet" type="text/css" />
......@@ -28,14 +28,14 @@
<script src="https://cdn.jsdelivr.net/npm/jquery@3.4.1/dist/jquery.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/vue@2.6.10/dist/vue.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap-vue@2.0.0-rc.27/dist/bootstrap-vue.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap-vue@2.0.0/dist/bootstrap-vue.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/axios@0.19.0/dist/axios.min.js"></script>
<script src="static/scald.js"></script>
</head>
<body class="dashboard" style="padding-top:55px; background-image:url({{ static_dir }}static/bns-light.jpg)">
<body class="dashboard" style="padding-top:55px; background-image:url(static/bns-light.jpg)">
<div id='report'>
% include('report_navbar.html', **config)
% include('content.html')
......
<nav class="navbar fixed-top navbar-expand-lg py-0">
<nav class="navbar online fixed-top navbar-expand-lg py-0">
<!-- add logo/title -->
% if 'image' in config:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment