From bea7ebc0357b7fd6e4ad461a507a4648a11fe93d Mon Sep 17 00:00:00 2001 From: nadjak77 Date: Wed, 6 Feb 2019 21:45:09 +0100 Subject: [PATCH 1/3] change variables --- administrator/templates/atum/scss/_variables.scss | 12 +++++++++--- .../templates/atum/scss/blocks/_header.scss | 2 +- administrator/templates/atum/scss/blocks/_login.scss | 10 +++++----- .../templates/atum/scss/blocks/_sidebar.scss | 2 +- .../templates/atum/scss/blocks/_toolbar.scss | 2 +- administrator/templates/atum/scss/template.scss | 4 ++-- 6 files changed, 19 insertions(+), 13 deletions(-) diff --git a/administrator/templates/atum/scss/_variables.scss b/administrator/templates/atum/scss/_variables.scss index 4726cc60376b7..3e9426c0b4d9d 100644 --- a/administrator/templates/atum/scss/_variables.scss +++ b/administrator/templates/atum/scss/_variables.scss @@ -13,9 +13,10 @@ $gray-700: #495057; $gray-800: #343a40; $gray-900: #212529; $black: #000; +$light-blue: #ebeff5; // BS Colours -$blue: #3073bb; +$blue: #1a466b; //#3073bb; $indigo: #0377be; $purple: #6f42c1; $pink: #e83e8c; @@ -27,12 +28,12 @@ $cyan: #108193; //variables for colors :root{ ---background-color-light:#ebf0f5; +/*--background-color-light:#ebf0f5; --background-color-dark:#1a466b; --font-color-light:#fff; --font-color-dark:var--(gray-600); --link-color:$gray-600; ---main-bg: #ebeff5; +--main-bg: #ebeff5;*/ } $theme-colors: (); @@ -67,6 +68,11 @@ $colors: ( white-offset: #fefefe, focus: #39f, table-border: $gray-300, + atum-bg-dark: $blue, + atum-bg-light: $light-blue, + atum-text-dark: $gray-600, + atum-text-light: $white, + atum-link-color:$gray-600 ); // Global diff --git a/administrator/templates/atum/scss/blocks/_header.scss b/administrator/templates/atum/scss/blocks/_header.scss index de7bcfc651dc5..f118d2a739a2d 100644 --- a/administrator/templates/atum/scss/blocks/_header.scss +++ b/administrator/templates/atum/scss/blocks/_header.scss @@ -88,7 +88,7 @@ padding-top: 0; &::after { - color: var(--main-bg); + color: var(--atum-bg-light); } } } diff --git a/administrator/templates/atum/scss/blocks/_login.scss b/administrator/templates/atum/scss/blocks/_login.scss index 3bc7881f9ea44..e09e30360e052 100644 --- a/administrator/templates/atum/scss/blocks/_login.scss +++ b/administrator/templates/atum/scss/blocks/_login.scss @@ -2,7 +2,7 @@ .view-login { .container-main{ - background: var(--background-color-light); + background: var(--atum-bg-light); /** * Note IDE's will consider this file import to fail in SCSS but this is correct for the final * compiled CSS file @@ -54,7 +54,7 @@ width: 23rem; background:var(--white); padding:15px; - color:var(--font-color-dark); + color:var(--atum-text-dark); border-radius:3px; -webkit-box-shadow: 0px 0px 10px 0px #ccc; -moz-box-shadow: 0px 0px 10px 0px #ccc; @@ -146,7 +146,7 @@ } #sidebar { - color: var(--font-color-light); + color: var(--atum-text-light); position:absolute; bottom: 40px; width: 100%; @@ -180,7 +180,7 @@ .com_login .sidebar-wrapper .main-brand{ margin-top:100px; - color:var(--font-color-light); + color:var(--atum-text-light); text-align:center; @include media-breakpoint-down(sm) { margin-top:10px; @@ -195,6 +195,6 @@ .com_login .sidebar-wrapper .main-brand a, .com_login .sidebar-wrapper #sidebar, .com_login .sidebar-wrapper #sidebar a{ - color:var(--font-color-light); + color:var(--atum-text-light); } diff --git a/administrator/templates/atum/scss/blocks/_sidebar.scss b/administrator/templates/atum/scss/blocks/_sidebar.scss index 72b82347f41c9..5419229bc303e 100644 --- a/administrator/templates/atum/scss/blocks/_sidebar.scss +++ b/administrator/templates/atum/scss/blocks/_sidebar.scss @@ -19,7 +19,7 @@ flex-direction: column; flex: 1 0 $sidebar-width; max-width: $sidebar-width; - background-color: var(--background-color-dark); + background-color: var(--atum-bg-dark); box-shadow: $atum-box-shadow; transition: all .3s ease; overflow: hidden; diff --git a/administrator/templates/atum/scss/blocks/_toolbar.scss b/administrator/templates/atum/scss/blocks/_toolbar.scss index 4f1d975f9b057..8840c990d3d37 100644 --- a/administrator/templates/atum/scss/blocks/_toolbar.scss +++ b/administrator/templates/atum/scss/blocks/_toolbar.scss @@ -10,7 +10,7 @@ min-height: 43px; padding: 13px 0; color: #0c192e; - background: var(--main-bg); + background: var(--atum-bg-light); .row { margin-right: 0; diff --git a/administrator/templates/atum/scss/template.scss b/administrator/templates/atum/scss/template.scss index 99e337f791215..128f57bd8feda 100644 --- a/administrator/templates/atum/scss/template.scss +++ b/administrator/templates/atum/scss/template.scss @@ -74,13 +74,13 @@ .container-main { position: relative; min-height: calc(100vh - #{$header-height}); - background-color: var(--main-bg); + background-color: var(--atum-bg-light); } .list-view-main { .container-main { - background-color: var(--main-bg); + background-color: var(--atum-bg-light); } } From 6984ea33eceecfbe4e281a021dc0c7189560a11b Mon Sep 17 00:00:00 2001 From: Benjamin Trenkle Date: Wed, 6 Feb 2019 23:51:02 +0100 Subject: [PATCH 2/3] Remove :root element --- administrator/templates/atum/scss/_variables.scss | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/administrator/templates/atum/scss/_variables.scss b/administrator/templates/atum/scss/_variables.scss index 3e9426c0b4d9d..a0b197fb5f128 100644 --- a/administrator/templates/atum/scss/_variables.scss +++ b/administrator/templates/atum/scss/_variables.scss @@ -26,16 +26,6 @@ $green: #2f7d32; $teal: #20c997; $cyan: #108193; -//variables for colors -:root{ -/*--background-color-light:#ebf0f5; ---background-color-dark:#1a466b; ---font-color-light:#fff; ---font-color-dark:var--(gray-600); ---link-color:$gray-600; ---main-bg: #ebeff5;*/ -} - $theme-colors: (); $theme-colors: map-merge(( primary: $blue, From 0d455632d2ff91b3b52bd2bcbc0ea5bc92816dbe Mon Sep 17 00:00:00 2001 From: Benjamin Trenkle Date: Wed, 6 Feb 2019 23:51:29 +0100 Subject: [PATCH 3/3] Remove comment --- administrator/templates/atum/scss/_variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/templates/atum/scss/_variables.scss b/administrator/templates/atum/scss/_variables.scss index a0b197fb5f128..de6c4deff659d 100644 --- a/administrator/templates/atum/scss/_variables.scss +++ b/administrator/templates/atum/scss/_variables.scss @@ -16,7 +16,7 @@ $black: #000; $light-blue: #ebeff5; // BS Colours -$blue: #1a466b; //#3073bb; +$blue: #1a466b; $indigo: #0377be; $purple: #6f42c1; $pink: #e83e8c;