From 72d643aa652f51f93c410b5298e43fa073f1c1e3 Mon Sep 17 00:00:00 2001 From: nadjak77 Date: Sun, 17 Feb 2019 21:00:14 +0100 Subject: [PATCH 1/2] change colors to selected customer colours change header scss --- administrator/templates/atum/index.php | 9 ++++++- .../templates/atum/scss/_variables.scss | 10 ++++---- .../templates/atum/scss/blocks/_global.scss | 11 +++++++++ .../templates/atum/scss/blocks/_header.scss | 15 ++++++------ .../templates/atum/scss/blocks/_sidebar.scss | 24 ++++++++++--------- 5 files changed, 46 insertions(+), 23 deletions(-) diff --git a/administrator/templates/atum/index.php b/administrator/templates/atum/index.php index dbf232bf63bf1..892bd1d7b6e90 100644 --- a/administrator/templates/atum/index.php +++ b/administrator/templates/atum/index.php @@ -66,7 +66,14 @@ if ($this->params->get('bg-dark')) { - $root[] = '--atum-bg-dark: ' . $this->params->get('bg-dark') . ';'; + + $bgcolor = trim($this->params->get('bg-dark'), '#'); + + list($red, $green, $blue) = str_split($bgcolor, 2); + + $root[] = '--atum-bg-dark: #' . $bgcolor . ';'; + $root[] = '--atum-bg-dark-light: ' . atum_brightness($bgcolor, +20) . ';'; + $root[] = '--atum-bg-dark-bright: ' . atum_brightness($bgcolor, +40) . ';'; } if ($this->params->get('bg-light')) diff --git a/administrator/templates/atum/scss/_variables.scss b/administrator/templates/atum/scss/_variables.scss index e8b33ecea38fd..ae2e5e29c465a 100644 --- a/administrator/templates/atum/scss/_variables.scss +++ b/administrator/templates/atum/scss/_variables.scss @@ -43,16 +43,16 @@ $theme-colors: map-merge(( $colors: ( // @TODO REMOVE THIS VARIABLES AND THEIR USAGE AND REPLACE WITH THE DIFFERENT SUBCOLORS - primary-dark: #2b5c91, - primary-light: #3a87cb, - primary-bright: #45a0f1, + //primary-dark: #2b5c91, + // primary-light: #3a87cb, + // primary-bright: #45a0f1, // END @TODO success-border: darken(theme-color("success"), 5%), info-border: darken(theme-color("info"), 7%), warning-border: darken(theme-color("warning"), 5%), danger-border: darken(theme-color("danger"), 5%), sidebar-sub-bg: #1b3654, - sidebar-text-color: #7189a4, + // sidebar-text-color: #7189a4, sidebar-link-color: #e3eaf1, sidebar-link-color-hover: var(--white), sidebar-child-link-color: #cbd6e2, @@ -70,6 +70,8 @@ $colors: ( atum-special-color:$dark-blue, atum-link-color: $blue-a700, atum-link-hover-color: darken($blue-a700, 15%), + atum-bg-dark-light:lighten($blue, 20%), + atum-bg-dark-bright:lighten($blue, 40%), ); // Global diff --git a/administrator/templates/atum/scss/blocks/_global.scss b/administrator/templates/atum/scss/blocks/_global.scss index 50e8333879e0b..0ced94d278d18 100644 --- a/administrator/templates/atum/scss/blocks/_global.scss +++ b/administrator/templates/atum/scss/blocks/_global.scss @@ -63,6 +63,17 @@ label, caption{ font-size: $label-font-size; } +.btn-primary:hover{ + background-color:$link-hover-color; + border-color:$link-hover-color; +} + +.logo{ + img path{ + fill:var(--atum-text-dark); + } +} + diff --git a/administrator/templates/atum/scss/blocks/_header.scss b/administrator/templates/atum/scss/blocks/_header.scss index 1e06b103bc60f..5fc9cdcd838d5 100644 --- a/administrator/templates/atum/scss/blocks/_header.scss +++ b/administrator/templates/atum/scss/blocks/_header.scss @@ -35,12 +35,12 @@ .nav-link { position: relative; padding: 0; - margin: 0 0.6rem; + margin: 0 0.8rem; line-height: $header-height; min-width: $header-height - 0.3125rem; .fa { - width: $header-height + 0.125rem; + width: 1.5rem; font-size: 1.2rem; color: var(--atum-special-color); vertical-align: middle; @@ -72,7 +72,7 @@ padding: 0; border: 0; z-index: 1041; - background-color: var(--primary-light); + background-color: var(--atum-bg-dark-light); h2 { font-size: $h5-font-size; @@ -86,7 +86,7 @@ .dropdown-item { color: $white; - background-color: var(--primary-light); + background-color: var(--atum-bg-dark-light); padding: 0; @include hover-focus { @@ -96,13 +96,14 @@ a { display: inline-block; width: 100%; - color: $white; + color: var(--atum-text-light); padding-left: 0.75rem; line-height: 3; &:hover { - color: var(--primary-dark); + color: var(--atum-text-light); text-decoration: none; + background:var(--atum-bg-dark); } .fa { @@ -112,7 +113,7 @@ .fa { padding: 1rem; - background-color: lighten(color("primary-light"), 5%); + background-color: var(--atum-bg-dark-bright);//lighten(color("primary-light"), 5%); width: 3rem; } diff --git a/administrator/templates/atum/scss/blocks/_sidebar.scss b/administrator/templates/atum/scss/blocks/_sidebar.scss index 828cdfdf450fe..de69454c9f9c2 100644 --- a/administrator/templates/atum/scss/blocks/_sidebar.scss +++ b/administrator/templates/atum/scss/blocks/_sidebar.scss @@ -67,32 +67,34 @@ // All list items li { - color: var(--sidebar-text-color); + color: var(--atum-text-light); list-style-type: none; } // All links a { position: relative; - color: var(--sidebar-link-color); + color: var(--atum-text-light); &:hover { - color: var(--sidebar-link-color-hover); + color: var(--atum-text-light); text-decoration: none; + } } // 1st level items > li { > ul { - background-color: var(--sidebar-sub-bg); + background-color: var(--atum-bg-dark-light); } > a { display: block; padding: 10px 6px; &:hover { - background-color: rgba(0,0,0,.4); + //background-color: rgba(0,0,0,.4); + background-color: var(--atum-bg-dark-light); } } &.active > a { @@ -105,7 +107,7 @@ left: 0; width: 3px; content: ""; - background-color: var(--primary); + background-color: var(--atum-bg-dark); } } } @@ -122,7 +124,7 @@ a { display: block; padding: 4px 5px 4px 34px; - color: var(--sidebar-child-link-color); + color: var(--atum-text-light); flex-basis: 100%; &:hover { @@ -132,7 +134,7 @@ &.active { color: $white; - background-color: var(--primary); + background-color: var(--atum-bg-dark); } &::before { @@ -162,7 +164,7 @@ top: 16px; width: .4rem; height: .4rem; - border-color: var(--sidebar-text-color); + border-color: var(--atum-text-light); } // 3rd level items @@ -189,7 +191,7 @@ .divider { height: 1px; margin: 4px 18px; - background-color: var(--sidebar-text-color); + background-color: var(--atum-text-light); opacity: .2; } @@ -222,7 +224,7 @@ right: 1em; width: .5rem; height: .5rem; - color: $white; + color: va(--atum-text-light); content: ""; border-color: initial; border-style: solid; From ef9d15df5a2aafb5a258db42fb9b02fb25a1b87a Mon Sep 17 00:00:00 2001 From: nadjak77 Date: Sun, 17 Feb 2019 21:16:06 +0100 Subject: [PATCH 2/2] remove eye icon --- administrator/modules/mod_status/tmpl/default.php | 1 - 1 file changed, 1 deletion(-) diff --git a/administrator/modules/mod_status/tmpl/default.php b/administrator/modules/mod_status/tmpl/default.php index 590a41958ba93..22a34a16a243c 100644 --- a/administrator/modules/mod_status/tmpl/default.php +++ b/administrator/modules/mod_status/tmpl/default.php @@ -41,7 +41,6 @@ -