From 91e0e131a5953472bea51d0a5d1bf952ffc1bb6d Mon Sep 17 00:00:00 2001 From: flaburgan Date: Mon, 7 Aug 2017 23:09:30 +0200 Subject: [PATCH] Improve colors management --- .../color_themes/_color_theme_override_dark.scss | 5 ----- app/assets/stylesheets/color_themes/dark/_style.scss | 3 ++- app/assets/stylesheets/header.scss | 12 ++++++------ 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/app/assets/stylesheets/color_themes/_color_theme_override_dark.scss b/app/assets/stylesheets/color_themes/_color_theme_override_dark.scss index 34aa72c76..ec5e4ef46 100644 --- a/app/assets/stylesheets/color_themes/_color_theme_override_dark.scss +++ b/app/assets/stylesheets/color_themes/_color_theme_override_dark.scss @@ -1,11 +1,6 @@ // Only overriding existing selectors here, so disable some lint rules // scss-lint:disable IdSelector, SelectorFormat, NestingDepth, SelectorDepth, QualifyingElement body { - .navbar.navbar-fixed-top #user-menu .dropdown-menu > li > a { - color: $text-color; - &:hover { color: $white; } - } - .publisher { form { #publisher_textarea_wrapper { background-color: $gray; } diff --git a/app/assets/stylesheets/color_themes/dark/_style.scss b/app/assets/stylesheets/color_themes/dark/_style.scss index 1078d86bc..62e74dee6 100644 --- a/app/assets/stylesheets/color_themes/dark/_style.scss +++ b/app/assets/stylesheets/color_themes/dark/_style.scss @@ -59,7 +59,8 @@ $dropdown-link-hover-color: $dropdown-link-color; //== Navbar $navbar-inverse-bg: $gray-darker; -$navbar-inverse-link-hover-color: $text-color; +$navbar-inverse-link-color: $gray-lighter; +$navbar-inverse-link-hover-color: $white; $navbar-inverse-brand-hover-color: $navbar-inverse-link-hover-color; //== Tabs diff --git a/app/assets/stylesheets/header.scss b/app/assets/stylesheets/header.scss index b7c24296f..d5723dce7 100644 --- a/app/assets/stylesheets/header.scss +++ b/app/assets/stylesheets/header.scss @@ -175,13 +175,13 @@ width: 100%; a { - color: #9d9d9d; + color: $navbar-inverse-link-color; font-weight: bold; padding: 10px 15px; &:hover { - background-color: transparent; - color: #fff; + background-color: $navbar-inverse-link-hover-bg; + color: $navbar-inverse-link-hover-color; } } } @@ -215,12 +215,12 @@ width: 100%; a { - color: $gray-light; + color: $navbar-inverse-link-color; padding-left: 55px; &:hover { - background-color: $brand-primary; - color: $gray-lighter; + background-color: $list-group-hover-bg; + color: $list-group-link-hover-color; } }