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

Remove variables from sidebar CSS

Browse source
This commit is contained in:
Annabel Dunstone Gray 2017-10-20 16:07:48 -07:00
parent 70d9401acd
commit 33380f811e
No known key found for this signature in database
GPG key ID: 7C8C78A372AD7A2D
2 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
app/assets/stylesheets/framework/contextual-sidebar.scss
View file

@ -1,13 +1,3 @@
$active-background: rgba(0, 0, 0, .04);
$active-hover-background: $active-background;
$active-hover-color: $gl-text-color;
$inactive-badge-background: rgba(0, 0, 0, .08);
$hover-background: rgba(0, 0, 0, .06);
$hover-color: $gl-text-color;
$inactive-color: $gl-text-color-secondary;
$contextual-sidebar-width: 220px;
$contextual-sidebar-collapsed-width: 50px;
.page-with-contextual-sidebar { .page-with-contextual-sidebar {
@media (min-width: $screen-md-min) { @media (min-width: $screen-md-min) {
padding-left: $contextual-sidebar-collapsed-width; padding-left: $contextual-sidebar-collapsed-width;
@ -48,12 +38,12 @@ $contextual-sidebar-collapsed-width: 50px;
&:hover, &:hover,
a:hover { a:hover {
background-color: $hover-background; background-color: $link-hover-background;
color: $hover-color; color: $gl-text-color;
.settings-avatar { .settings-avatar {
svg { svg {
fill: $hover-color; fill: $gl-text-color;
} }
} }
} }
@ -145,11 +135,11 @@ $contextual-sidebar-collapsed-width: 50px;
display: flex; display: flex;
align-items: center; align-items: center;
padding: 12px 16px; padding: 12px 16px;
color: $inactive-color; color: $gl-text-color-secondary;
} }
svg { svg {
fill: $inactive-color; fill: $gl-text-color-secondary;
} }
} }
@ -206,8 +196,8 @@ $contextual-sidebar-collapsed-width: 50px;
&:hover, &:hover,
&:focus { &:focus {
background: $active-hover-background; background: $link-active-background;
color: $active-hover-color; color: $gl-text-color;
} }
} }
@ -216,7 +206,7 @@ $contextual-sidebar-collapsed-width: 50px;
&, &,
&:hover, &:hover,
&:focus { &:focus {
background: $active-background; background: $link-active-background;
} }
} }
} }
@ -304,11 +294,11 @@ $contextual-sidebar-collapsed-width: 50px;
.badge { .badge {
background-color: $inactive-badge-background; background-color: $inactive-badge-background;
color: $inactive-color; color: $gl-text-color-secondary;
} }
&.active { &.active {
background: $active-background; background: $link-active-background;
> a { > a {
margin-left: 4px; margin-left: 4px;
@ -326,7 +316,7 @@ $contextual-sidebar-collapsed-width: 50px;
&.active > a:hover, &.active > a:hover,
&.is-over > a { &.is-over > a {
background-color: $hover-background; background-color: $link-hover-background;
} }
} }
} }

10
app/assets/stylesheets/framework/variables.scss
View file

@ -9,6 +9,8 @@ $sidebar-transition-duration: .15s;
$sidebar-breakpoint: 1024px; $sidebar-breakpoint: 1024px;
$default-transition-duration: .15s; $default-transition-duration: .15s;
$right-sidebar-transition-duration: .3s; $right-sidebar-transition-duration: .3s;
$contextual-sidebar-width: 220px;
$contextual-sidebar-collapsed-width: 50px;
/* /*
* Color schema * Color schema
@ -358,6 +360,13 @@ $dropdown-item-hover-bg: $gray-darker;
$filtered-search-term-shadow-color: rgba(0, 0, 0, 0.09); $filtered-search-term-shadow-color: rgba(0, 0, 0, 0.09);
$dropdown-hover-color: $blue-400; $dropdown-hover-color: $blue-400;
/*
* Contextual Sidebar
*/
$link-active-background: rgba(0, 0, 0, .04);
$link-hover-background: rgba(0, 0, 0, .06);
$inactive-badge-background: rgba(0, 0, 0, .08);
/* /*
* Buttons * Buttons
*/ */
@ -404,7 +413,6 @@ $note-targe3-inside: #ffffd3;
$note-line2-border: #ddd; $note-line2-border: #ddd;
$note-icon-gutter-width: 55px; $note-icon-gutter-width: 55px;
/* /*
* Zen * Zen
*/ */