summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-05-13 15:44:11 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-05-13 15:44:11 +0000
commit22ff0d34211f255e02eea08d1d465d1a8aac3222 (patch)
treec0cc78d1fb3763ed5aed482242e8acfdd5c9e75f
parentc37006fa4f4a85c031d4916a618be39ac0b0d3ed (diff)
parentae89161db5d6294948990b1d87f4fa306f2a1be9 (diff)
downloadgitlab-ce-22ff0d34211f255e02eea08d1d465d1a8aac3222.tar.gz
Merge branch 'dz-improve-sidebar-design' into 'master'
Remove background color differentiation from gitlab logo/text in sidebar Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @annabeldunstone @skyruler See merge request !4139
-rw-r--r--app/assets/stylesheets/framework/gitlab-theme.scss5
1 files changed, 1 insertions, 4 deletions
diff --git a/app/assets/stylesheets/framework/gitlab-theme.scss b/app/assets/stylesheets/framework/gitlab-theme.scss
index dc4668877f2..51a17d1469e 100644
--- a/app/assets/stylesheets/framework/gitlab-theme.scss
+++ b/app/assets/stylesheets/framework/gitlab-theme.scss
@@ -9,9 +9,6 @@
@mixin gitlab-theme($color-light, $color, $color-darker, $color-dark) {
.page-with-sidebar {
.header-logo {
- background-color: $color;
- border-color: $color;
-
a {
color: $color-light;
@@ -21,7 +18,7 @@
}
&:hover {
- background-color: $color-darker;
+ background-color: $color-dark;
a {
color: #fff;