From 2d2015d3dd4e7b4cef7fe4e4f72d368250cda65f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 22 Nov 2017 17:18:04 +0100 Subject: [PATCH] ux: tweaked panel color and dashboard background is same as page background --- public/sass/_variables.dark.scss | 6 +++--- public/sass/components/_tabbed_view.scss | 7 ------- public/sass/components/_tabs.scss | 2 +- public/sass/pages/_dashboard.scss | 2 +- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/public/sass/_variables.dark.scss b/public/sass/_variables.dark.scss index 61531a68209..fd7674491c3 100644 --- a/public/sass/_variables.dark.scss +++ b/public/sass/_variables.dark.scss @@ -90,11 +90,11 @@ $component-active-bg: $brand-primary !default; // Panel // ------------------------- -$panel-bg: $dark-2; -$panel-border-color: $dark-2; +$panel-bg: #212124; +$panel-border-color: $dark-1; $panel-border: solid 1px $panel-border-color; $panel-drop-zone-bg: repeating-linear-gradient(-128deg, #111, #111 10px, #191919 10px, #222 20px); -$panel-header-hover-bg: $dark-3; +$panel-header-hover-bg: $dark-4; $panel-header-menu-hover-bg: $dark-5; $divider-border-color: #555; diff --git a/public/sass/components/_tabbed_view.scss b/public/sass/components/_tabbed_view.scss index d494bba3fd6..c1bc8455205 100644 --- a/public/sass/components/_tabbed_view.scss +++ b/public/sass/components/_tabbed_view.scss @@ -8,13 +8,6 @@ .tabbed-view-header { padding: 1.5em 1rem 0 1rem; } - - .gf-tabs-link.active { - background-color: #0a0a0a; - } - .tabbed-view-body { - min-height: 200px; - } } } diff --git a/public/sass/components/_tabs.scss b/public/sass/components/_tabs.scss index 1bd6bcbc4df..6aebf846450 100644 --- a/public/sass/components/_tabs.scss +++ b/public/sass/components/_tabs.scss @@ -62,7 +62,7 @@ &.active:focus { @include border-radius(3px); border-color: rgba(216, 131, 40, 0.77); - border-bottom: 2px solid #0a0a0a; + border-bottom: 1px solid $page-bg; color: $link-color; position: relative; top: 1px; diff --git a/public/sass/pages/_dashboard.scss b/public/sass/pages/_dashboard.scss index 0549d5f6dda..8d4e82af6b0 100644 --- a/public/sass/pages/_dashboard.scss +++ b/public/sass/pages/_dashboard.scss @@ -2,7 +2,7 @@ padding: $dashboard-padding; width: 100%; min-height: 100%; - background: $dashboard-gradient; + // background: $dashboard-gradient; } .template-variable {