diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
tree | c42be41678c2586d49a75cabce89322082698334 /app/assets/stylesheets/themes | |
parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'app/assets/stylesheets/themes')
-rw-r--r-- | app/assets/stylesheets/themes/_dark.scss | 11 | ||||
-rw-r--r-- | app/assets/stylesheets/themes/theme_helper.scss | 25 | ||||
-rw-r--r-- | app/assets/stylesheets/themes/theme_indigo.scss | 2 |
3 files changed, 24 insertions, 14 deletions
diff --git a/app/assets/stylesheets/themes/_dark.scss b/app/assets/stylesheets/themes/_dark.scss index 9d98fe5c739..ea7aaaa8ec8 100644 --- a/app/assets/stylesheets/themes/_dark.scss +++ b/app/assets/stylesheets/themes/_dark.scss @@ -253,3 +253,14 @@ $well-inner-border: $gray-200; color: $gray-900; border-color: $gray-800; } + +.nav-sidebar { + li.active { + box-shadow: none; + } + + .sidebar-sub-level-items.fly-out-list { + box-shadow: none; + border: 1px solid $border-color; + } +} diff --git a/app/assets/stylesheets/themes/theme_helper.scss b/app/assets/stylesheets/themes/theme_helper.scss index 6a60978b954..a94169ab494 100644 --- a/app/assets/stylesheets/themes/theme_helper.scss +++ b/app/assets/stylesheets/themes/theme_helper.scss @@ -174,20 +174,20 @@ } // Sidebar - .nav-sidebar li.active { - box-shadow: inset 4px 0 0 $border-and-box-shadow; - - > a { - color: $sidebar-text; - } - - .nav-icon-container svg { - fill: $sidebar-text; - } + .nav-sidebar li.active > a { + color: $sidebar-text; } - .sidebar-top-level-items > li.active .badge.badge-pill { - color: $sidebar-text; + .nav-sidebar { + .fly-out-top-item { + a, + a:hover, + &.active a, + .fly-out-top-item-container { + background-color: $purple-900; + color: var(--black, $white); + } + } } .nav-links li { @@ -213,7 +213,6 @@ .ide-sidebar-link { &.active { color: $border-and-box-shadow; - box-shadow: inset 3px 0 $border-and-box-shadow; &.is-right { box-shadow: inset -3px 0 $border-and-box-shadow; diff --git a/app/assets/stylesheets/themes/theme_indigo.scss b/app/assets/stylesheets/themes/theme_indigo.scss index bbf14afcca2..9566c9c6004 100644 --- a/app/assets/stylesheets/themes/theme_indigo.scss +++ b/app/assets/stylesheets/themes/theme_indigo.scss @@ -6,7 +6,7 @@ body { $indigo-200, $indigo-500, $indigo-700, - $indigo-800, + $purple-900, $indigo-900, $white ); |