From 8be9a13c0e445898e4ba17ac24633b44f4662261 Mon Sep 17 00:00:00 2001
From: rbokhorst <rbokhorst@astron.nl>
Date: Thu, 18 Oct 2018 11:56:08 +0000
Subject: [PATCH] OSB-29: house style
---
.../src/components/LatestObservations.css | 2 +-
.../src/themes/lofar-styles.css | 21 ++--
.../src/themes/lofar-styles.scss | 8 +-
.../src/themes/lofar-variables.scss | 8 +-
.../maintenancedb_view/src/themes/lofar.css | 103 +++++++++---------
5 files changed, 76 insertions(+), 66 deletions(-)
diff --git a/LCU/Maintenance/MDB_WebView/maintenancedb_view/src/components/LatestObservations.css b/LCU/Maintenance/MDB_WebView/maintenancedb_view/src/components/LatestObservations.css
index c7d11907e43..d851907ef40 100644
--- a/LCU/Maintenance/MDB_WebView/maintenancedb_view/src/components/LatestObservations.css
+++ b/LCU/Maintenance/MDB_WebView/maintenancedb_view/src/components/LatestObservations.css
@@ -4,4 +4,4 @@
/* font color */
/* Data colors */
.hoverable:hover {
- background-color: #ede7f6; }
+ background-color: #bdbdbd; }
diff --git a/LCU/Maintenance/MDB_WebView/maintenancedb_view/src/themes/lofar-styles.css b/LCU/Maintenance/MDB_WebView/maintenancedb_view/src/themes/lofar-styles.css
index 5503e032345..ccb73b919e4 100644
--- a/LCU/Maintenance/MDB_WebView/maintenancedb_view/src/themes/lofar-styles.css
+++ b/LCU/Maintenance/MDB_WebView/maintenancedb_view/src/themes/lofar-styles.css
@@ -9,12 +9,12 @@ body {
.react-grid-item {
background-color: white;
- border: 1px solid #bbb5c3;
+ border: 1px solid #bdbdbd;
border-radius: 0.25rem; }
.react-grid-item-header {
- color: black;
- background-color: #bbb5c3;
+ color: #333333;
+ background-color: #bdbdbd;
font-weight: bold;
padding: .3rem;
/* Note: must be same as the Bootstrap table for nice alignment */
@@ -66,14 +66,17 @@ body {
width: 100%;
overflow: auto; }
+.landing-page-toolbar {
+ font-weight: 500; }
+
.landing-page-toolbar .btn-info:not(:disabled):not(.disabled).active,
.landing-page-toolbar .btn-info:not(:disabled):not(.disabled):active,
.landing-page-toolbar .show > .btn-info.dropdown-toggle {
- color: #000000;
- background-color: #bbb5c3;
- border-color: #bbb5c3; }
+ color: white;
+ background-color: #8d8d8d;
+ border-color: #8d8d8d; }
.landing-page-toolbar .btn-info {
- color: #000000;
- background-color: #ede7f6;
- border-color: #ede7f6; }
+ color: white;
+ background-color: #bdbdbd;
+ border-color: #bdbdbd; }
diff --git a/LCU/Maintenance/MDB_WebView/maintenancedb_view/src/themes/lofar-styles.scss b/LCU/Maintenance/MDB_WebView/maintenancedb_view/src/themes/lofar-styles.scss
index 3bc3e02bd20..3823cd7aa43 100644
--- a/LCU/Maintenance/MDB_WebView/maintenancedb_view/src/themes/lofar-styles.scss
+++ b/LCU/Maintenance/MDB_WebView/maintenancedb_view/src/themes/lofar-styles.scss
@@ -6,7 +6,8 @@ body {
background-color: #E1E2E1!important;
}
-$griditem: $secondary-dark;
+$griditem: $secondary;
+$griditem-color: #333333;
.react-grid-item {
background-color: white;
@@ -15,7 +16,7 @@ $griditem: $secondary-dark;
}
.react-grid-item-header {
- color: black;
+ color: $griditem-color;
background-color: $griditem;
font-weight: bold;
padding: .3rem; /* Note: must be same as the Bootstrap table for nice alignment */
@@ -68,6 +69,9 @@ $griditem: $secondary-dark;
overflow: auto;
}
+.landing-page-toolbar {
+ font-weight: 500;
+}
.landing-page-toolbar .btn-info:not(:disabled):not(.disabled).active,
.landing-page-toolbar .btn-info:not(:disabled):not(.disabled):active,
.landing-page-toolbar .show>.btn-info.dropdown-toggle {
diff --git a/LCU/Maintenance/MDB_WebView/maintenancedb_view/src/themes/lofar-variables.scss b/LCU/Maintenance/MDB_WebView/maintenancedb_view/src/themes/lofar-variables.scss
index f321842e39d..1c9592c2c79 100644
--- a/LCU/Maintenance/MDB_WebView/maintenancedb_view/src/themes/lofar-variables.scss
+++ b/LCU/Maintenance/MDB_WebView/maintenancedb_view/src/themes/lofar-variables.scss
@@ -8,10 +8,10 @@ $primary-light: #a7689d;
$primary-dark: #490f44;
$primary-color: #ffffff; /* font color */
-$secondary: #ede7f6;
-$secondary-light: #ffffff;
-$secondary-dark: #bbb5c3;
-$secondary-color: #000000; /* font color */
+$secondary: #bdbdbd;
+$secondary-light: #efefef;
+$secondary-dark: #8d8d8d;
+$secondary-color: white; /* font color */
/* Data colors */
diff --git a/LCU/Maintenance/MDB_WebView/maintenancedb_view/src/themes/lofar.css b/LCU/Maintenance/MDB_WebView/maintenancedb_view/src/themes/lofar.css
index 9c68539f01d..dd30e99a606 100644
--- a/LCU/Maintenance/MDB_WebView/maintenancedb_view/src/themes/lofar.css
+++ b/LCU/Maintenance/MDB_WebView/maintenancedb_view/src/themes/lofar.css
@@ -24,7 +24,7 @@
--gray: #6c757d;
--gray-dark: #343a40;
--primary: #773b6f;
- --secondary: #ede7f6;
+ --secondary: #bdbdbd;
--success: #28a745;
--info: #17a2b8;
--warning: #fbfb83;
@@ -1094,13 +1094,13 @@ pre {
.table-secondary,
.table-secondary > th,
.table-secondary > td {
- background-color: #faf8fc; }
+ background-color: #ededed; }
.table-hover .table-secondary:hover {
- background-color: #ede6f4; }
+ background-color: #e0e0e0; }
.table-hover .table-secondary:hover > td,
.table-hover .table-secondary:hover > th {
- background-color: #ede6f4; }
+ background-color: #e0e0e0; }
.table-success,
.table-success > th,
@@ -1653,26 +1653,26 @@ fieldset:disabled a.btn {
.btn-secondary {
color: #212529;
- background-color: #ede7f6;
- border-color: #ede7f6; }
+ background-color: #bdbdbd;
+ border-color: #bdbdbd; }
.btn-secondary:hover {
color: #212529;
- background-color: #d8cbec;
- border-color: #d1c2e8; }
+ background-color: #aaaaaa;
+ border-color: #a4a4a4; }
.btn-secondary:focus, .btn-secondary.focus {
- box-shadow: 0 0 0 0.2rem rgba(237, 231, 246, 0.5); }
+ box-shadow: 0 0 0 0.2rem rgba(189, 189, 189, 0.5); }
.btn-secondary.disabled, .btn-secondary:disabled {
color: #212529;
- background-color: #ede7f6;
- border-color: #ede7f6; }
+ background-color: #bdbdbd;
+ border-color: #bdbdbd; }
.btn-secondary:not(:disabled):not(.disabled):active, .btn-secondary:not(:disabled):not(.disabled).active,
.show > .btn-secondary.dropdown-toggle {
color: #212529;
- background-color: #d1c2e8;
- border-color: #cab9e5; }
+ background-color: #a4a4a4;
+ border-color: #9d9d9d; }
.btn-secondary:not(:disabled):not(.disabled):active:focus, .btn-secondary:not(:disabled):not(.disabled).active:focus,
.show > .btn-secondary.dropdown-toggle:focus {
- box-shadow: 0 0 0 0.2rem rgba(237, 231, 246, 0.5); }
+ box-shadow: 0 0 0 0.2rem rgba(189, 189, 189, 0.5); }
.btn-success {
color: #fff;
@@ -1836,27 +1836,27 @@ fieldset:disabled a.btn {
box-shadow: 0 0 0 0.2rem rgba(119, 59, 111, 0.5); }
.btn-outline-secondary {
- color: #ede7f6;
+ color: #bdbdbd;
background-color: transparent;
background-image: none;
- border-color: #ede7f6; }
+ border-color: #bdbdbd; }
.btn-outline-secondary:hover {
color: #212529;
- background-color: #ede7f6;
- border-color: #ede7f6; }
+ background-color: #bdbdbd;
+ border-color: #bdbdbd; }
.btn-outline-secondary:focus, .btn-outline-secondary.focus {
- box-shadow: 0 0 0 0.2rem rgba(237, 231, 246, 0.5); }
+ box-shadow: 0 0 0 0.2rem rgba(189, 189, 189, 0.5); }
.btn-outline-secondary.disabled, .btn-outline-secondary:disabled {
- color: #ede7f6;
+ color: #bdbdbd;
background-color: transparent; }
.btn-outline-secondary:not(:disabled):not(.disabled):active, .btn-outline-secondary:not(:disabled):not(.disabled).active,
.show > .btn-outline-secondary.dropdown-toggle {
color: #212529;
- background-color: #ede7f6;
- border-color: #ede7f6; }
+ background-color: #bdbdbd;
+ border-color: #bdbdbd; }
.btn-outline-secondary:not(:disabled):not(.disabled):active:focus, .btn-outline-secondary:not(:disabled):not(.disabled).active:focus,
.show > .btn-outline-secondary.dropdown-toggle:focus {
- box-shadow: 0 0 0 0.2rem rgba(237, 231, 246, 0.5); }
+ box-shadow: 0 0 0 0.2rem rgba(189, 189, 189, 0.5); }
.btn-outline-success {
color: #28a745;
@@ -3380,11 +3380,11 @@ input[type="button"].btn-block {
.badge-secondary {
color: #212529;
- background-color: #ede7f6; }
+ background-color: #bdbdbd; }
.badge-secondary[href]:hover, .badge-secondary[href]:focus {
color: #212529;
text-decoration: none;
- background-color: #d1c2e8; }
+ background-color: #a4a4a4; }
.badge-success {
color: #fff;
@@ -3480,13 +3480,13 @@ input[type="button"].btn-block {
color: #1c0e1a; }
.alert-secondary {
- color: #7b7880;
- background-color: #fbfafd;
- border-color: #faf8fc; }
+ color: #626262;
+ background-color: #f2f2f2;
+ border-color: #ededed; }
.alert-secondary hr {
- border-top-color: #ede6f4; }
+ border-top-color: #e0e0e0; }
.alert-secondary .alert-link {
- color: #625f66; }
+ color: #494949; }
.alert-success {
color: #155724;
@@ -3650,15 +3650,15 @@ input[type="button"].btn-block {
border-color: #3e1f3a; }
.list-group-item-secondary {
- color: #7b7880;
- background-color: #faf8fc; }
+ color: #626262;
+ background-color: #ededed; }
.list-group-item-secondary.list-group-item-action:hover, .list-group-item-secondary.list-group-item-action:focus {
- color: #7b7880;
- background-color: #ede6f4; }
+ color: #626262;
+ background-color: #e0e0e0; }
.list-group-item-secondary.list-group-item-action.active {
color: #fff;
- background-color: #7b7880;
- border-color: #7b7880; }
+ background-color: #626262;
+ border-color: #626262; }
.list-group-item-success {
color: #155724;
@@ -4291,12 +4291,12 @@ button.bg-primary:focus {
background-color: #552a4f !important; }
.bg-secondary {
- background-color: #ede7f6 !important; }
+ background-color: #bdbdbd !important; }
a.bg-secondary:hover, a.bg-secondary:focus,
button.bg-secondary:hover,
button.bg-secondary:focus {
- background-color: #d1c2e8 !important; }
+ background-color: #a4a4a4 !important; }
.bg-success {
background-color: #28a745 !important; }
@@ -4386,7 +4386,7 @@ button.bg-dark:focus {
border-color: #773b6f !important; }
.border-secondary {
- border-color: #ede7f6 !important; }
+ border-color: #bdbdbd !important; }
.border-success {
border-color: #28a745 !important; }
@@ -6193,10 +6193,10 @@ a.text-primary:hover, a.text-primary:focus {
color: #552a4f !important; }
.text-secondary {
- color: #ede7f6 !important; }
+ color: #bdbdbd !important; }
a.text-secondary:hover, a.text-secondary:focus {
- color: #d1c2e8 !important; }
+ color: #a4a4a4 !important; }
.text-success {
color: #28a745 !important; }
@@ -6328,12 +6328,12 @@ body {
.react-grid-item {
background-color: white;
- border: 1px solid #bbb5c3;
+ border: 1px solid #bdbdbd;
border-radius: 0.25rem; }
.react-grid-item-header {
- color: black;
- background-color: #bbb5c3;
+ color: #333333;
+ background-color: #bdbdbd;
font-weight: bold;
padding: .3rem;
/* Note: must be same as the Bootstrap table for nice alignment */
@@ -6385,14 +6385,17 @@ body {
width: 100%;
overflow: auto; }
+.landing-page-toolbar {
+ font-weight: 500; }
+
.landing-page-toolbar .btn-info:not(:disabled):not(.disabled).active,
.landing-page-toolbar .btn-info:not(:disabled):not(.disabled):active,
.landing-page-toolbar .show > .btn-info.dropdown-toggle {
- color: #000000;
- background-color: #bbb5c3;
- border-color: #bbb5c3; }
+ color: white;
+ background-color: #8d8d8d;
+ border-color: #8d8d8d; }
.landing-page-toolbar .btn-info {
- color: #000000;
- background-color: #ede7f6;
- border-color: #ede7f6; }
+ color: white;
+ background-color: #bdbdbd;
+ border-color: #bdbdbd; }
--
GitLab