summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-05-16 21:47:21 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-05-16 21:47:21 +0000
commit4ade5ff42511d7931bebb28098c2dc2192caba3e (patch)
tree0b295ebf03495014c3a27a03dd4a006dd9624fa3
parent8b15628dd0de2474ad662b8d78a7c9a466e2a296 (diff)
parente9fdfb9a71d26f501c988033e9b4de8d607f1d61 (diff)
downloadgitlab-ce-4ade5ff42511d7931bebb28098c2dc2192caba3e.tar.gz
Merge branch 'dz-fix-sidebar-overlap' into 'master'
Fix left sidebar overlap when scroll on long menu Fixes #17566. Caused by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4139. Smaller fix compared to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4164 cc @iamphill @jschatz1 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !4165
-rw-r--r--app/assets/stylesheets/framework/gitlab-theme.scss2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/gitlab-theme.scss b/app/assets/stylesheets/framework/gitlab-theme.scss
index f47eb1f233e..16cf394c426 100644
--- a/app/assets/stylesheets/framework/gitlab-theme.scss
+++ b/app/assets/stylesheets/framework/gitlab-theme.scss
@@ -9,6 +9,8 @@
@mixin gitlab-theme($color-light, $color, $color-darker, $color-dark) {
.page-with-sidebar {
.header-logo {
+ background: $color-darker;
+
a {
color: $color-light;