Commit d66e0d4d authored by Phil Hughes's avatar Phil Hughes

Merge branch '37573-fix-sidebar-active-color' into 'master'

Update badge color to match theme; lighten active color in sidebar

Closes #37573

See merge request gitlab-org/gitlab-ce!14116
parents 3238dc86 6830d87c
......@@ -158,11 +158,23 @@
box-shadow: inset 4px 0 0 $color-700;
> a {
color: $color-900;
color: $color-800;
}
svg {
fill: $color-900;
fill: $color-800;
}
}
.sidebar-top-level-items > li.active .badge {
color: $color-800;
}
.nav-links li.active a {
border-bottom-color: $color-500;
.badge {
font-weight: $gl-font-weight-bold;
}
}
}
......@@ -261,5 +273,9 @@ body {
fill: $theme-gray-900;
}
}
.sidebar-top-level-items > li.active .badge {
color: $theme-gray-900;
}
}
}
......@@ -3,8 +3,6 @@
@import "bootstrap/variables";
$active-background: rgba(0, 0, 0, .04);
$active-border: $indigo-500;
$active-color: $indigo-700;
$active-hover-background: $active-background;
$active-hover-color: $gl-text-color;
$inactive-badge-background: rgba(0, 0, 0, .08);
......@@ -217,7 +215,6 @@ $new-sidebar-collapsed-width: 50px;
&:hover,
&:focus {
background: $active-background;
color: $active-color;
}
}
}
......@@ -317,7 +314,6 @@ $new-sidebar-collapsed-width: 50px;
}
.badge {
color: $active-color;
font-weight: $gl-font-weight-bold;
}
......@@ -494,13 +490,3 @@ $new-sidebar-collapsed-width: 50px;
.with-performance-bar .boards-list {
height: calc(100vh - #{$new-navbar-height} - #{$performance-bar-height});
}
// Change color of all horizontal tabs to match the new indigo color
.nav-links li.active a {
border-bottom-color: $active-border;
.badge {
font-weight: $gl-font-weight-bold;
}
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment