summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-06-10 15:29:40 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-06-10 15:29:40 +0000
commit2e7e2b534907b7095e20edeca30c99c18ea436af (patch)
treec5e9338a26807d842232685b1c7c49ec96b48d76 /app/assets
parent7aa67688127a4ff4553ae6f8ff66e9757275ea39 (diff)
parente7950bd9429d104cc5ef7ca0e0195ecbace4b295 (diff)
downloadgitlab-ce-2e7e2b534907b7095e20edeca30c99c18ea436af.tar.gz
Merge branch 'project-dropdown-position-fix' into 'master'
Fixed project dropdown being overlapped by sidebar ## What does this MR do? Changes the header expanded `padding` to `margin` to prevent the project dropdown from overlapping. ## What are the relevant issue numbers? Closes #18410 ## Screenshots (if relevant) ![Screen_Shot_2016-06-10_at_10.38.00](/uploads/b569d6d4cbd126fd776cf849ebc1137d/Screen_Shot_2016-06-10_at_10.38.00.png) See merge request !4583
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/framework/header.scss2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index c46d6b14782..b8d4233537b 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -185,7 +185,7 @@ header {
margin-left: 0;
.header-content {
- padding-left: $sidebar_width;
+ margin-left: $sidebar_width;
transition-duration: .3s;
}
}