From bc7005aeef5748253e75838995653e07039e230f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Thu, 29 Apr 2021 17:49:51 +0200 Subject: [PATCH] Simplify dropdown menu colors Using `inherit` we don't have to overwrite the styles in the admin menu. --- app/assets/stylesheets/admin.scss | 4 ---- app/assets/stylesheets/layout.scss | 11 ++++------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index 91a80ff92..e03125ca4 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -147,10 +147,6 @@ $table-header: #ecf1f6; @include breakpoint(medium) { height: auto !important; } - - a { - color: #000 !important; - } } .title-bar { diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 7358c43ad..39c9b4eea 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -559,7 +559,7 @@ body > header, } a { - color: #fff; + color: inherit; padding-left: 0; @include breakpoint(medium) { @@ -591,6 +591,7 @@ body > header, &.is-dropdown-submenu { background: #fff; + color: $text; margin: 0; margin-top: rem-calc(-12); padding: 0; @@ -601,10 +602,6 @@ body > header, display: block; height: auto; margin-bottom: 0; - - a { - color: $text; - } } } @@ -647,7 +644,7 @@ body > header, } &.is-active > a { - color: #fff; + color: inherit; } &.is-dropdown-submenu-parent > a::after { @@ -787,7 +784,7 @@ body > header, margin-bottom: $line-height / 2; a { - color: $text; + color: inherit; display: inline-block; font-weight: bold; margin-right: $line-height / 2;