kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Browse source
This commit is contained in:
Annabel Dunstone Gray 2017-09-14 08:54:33 +00:00 committed by Phil Hughes
parent 3238dc8654
commit 6830d87cbc
2 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/assets/stylesheets/framework/gitlab-theme.scss
View file

@ -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;
}
}
}

14
app/assets/stylesheets/new_sidebar.scss
View file

@ -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;
}
}