Skip to content

Commit 861c036

Browse files
author
Mark Williams
committed
LIMS-1974: Use a phase banner
1 parent bf2520c commit 861c036

File tree

3 files changed

+13
-21
lines changed

3 files changed

+13
-21
lines changed

client/src/js/app/components/breadcrumbs.vue

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<section class="bread">
3-
<ul id="breadcrumbs" :class="getBackgroundClass">
3+
<ul id="breadcrumbs">
44
<li
55
v-for="(item, index) in bc"
66
:key="index"
@@ -30,21 +30,14 @@ export default {
3030
var title = this.bc.map( (item) => { return item.title} )
3131
document.title = 'ISPyB » ' + title.join(' » ')
3232
}
33-
},
34-
computed: {
35-
isDevMode() {
36-
return this.$store.state.mode === 'development'
37-
},
38-
getBackgroundClass : function() {
39-
return this.isDevMode ? 'tw-bg-header-background-dev' : 'tw-bg-header-background'
40-
},
41-
},
33+
}
4234
}
4335
</script>
4436

4537
<style scoped>
4638
4739
#breadcrumbs {
40+
@apply tw-bg-header-bc-background;
4841
@apply tw-text-header-bc-color;
4942
@apply tw-p-1;
5043
@apply tw-text-xxs;

client/src/js/app/components/header.vue

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
<template>
2+
<div>
3+
<div
4+
v-if="isDevMode"
5+
class="tw-flex tw-h-10 tw-items-center tw-bg-content-active"
6+
>
7+
<span class="fa fa-2x fa-exclamation-circle tw-mx-1"></span>
8+
This application is running in development mode. Data will not be persisted.
9+
</div>
210
<div
311
id="vue-header"
4-
class="tw-flex tw-justify-between tw-items-center tw-h-10"
5-
:class="getBackgroundClass"
12+
class="tw-flex tw-justify-between tw-items-center tw-h-10 tw-bg-header-background"
613
>
714
<div class="">
815
<router-link
@@ -50,10 +57,6 @@
5057
</p>
5158
</router-link>
5259
</div>
53-
<div v-if="isDevMode" class="tw-flex tw-items-center tw-justify-center tw-text-header-color">
54-
<span class="fa fa-2x fa-exclamation-circle tw-mx-1"></span>
55-
<p class="tw-hidden lg:tw-inline">Development Database</p>
56-
</div>
5760
<div
5861
class="tw-flex"
5962
>
@@ -77,6 +80,7 @@
7780
</router-link>
7881
</div>
7982
</div>
83+
</div>
8084
</template>
8185

8286
<script>
@@ -118,9 +122,6 @@ export default {
118122
isDevMode() {
119123
return this.$store.state.mode === 'development'
120124
},
121-
getBackgroundClass : function() {
122-
return this.isDevMode ? 'tw-bg-header-background-dev' : 'tw-bg-header-background'
123-
},
124125
},
125126
methods: {
126127
logout: function () {

client/tailwind.config.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,13 @@ module.exports = {
9595
'sidebar-mobile-hover-background': 'rgb(105,105,105)',
9696
// Header
9797
'header-background': '#112e4d',
98-
'header-background-dev': '#2e4d11',
9998
'header-color': '#aaaaaa',
10099
'header-hover-color': '#ffffff',
101100
// Header Menu
102101
'header-menu-color': '#dddddd',
103102
'header-menu-hover': '#ffffff',
104103
// Header Breadcrumbs
105104
'header-bc-background': '#112e4d',
106-
'header-bc-background-dev': '#2e4d11',
107105
'header-bc-color': '#dbdbdb',
108106
'header-bc-hover': '#ffffff',
109107
// Footer

0 commit comments

Comments
 (0)