summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-05-19 14:55:49 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-05-19 14:55:49 +0000
commit3c45906bdaed617a0e9446ca9f91222a900eafbb (patch)
tree81ccbb2dec1806bdb1ad281684dc9c98bc29ca38
parent9d29eb7e292067fb980b4ca97fc6c3edac1dccec (diff)
parent9afa66849a9aa8533b6a8fcd4430d92286dc0a3d (diff)
downloadgitlab-ce-3c45906bdaed617a0e9446ca9f91222a900eafbb.tar.gz
Merge branch 'fix-header-z-index' into 'master'
Replaced duplicate z-index with index of 400 Closes #32609 See merge request !11547
-rw-r--r--app/assets/stylesheets/framework/header.scss3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index 65b5f4af037..ce8b27a1951 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -24,14 +24,13 @@ header {
&.navbar-gitlab {
padding: 0 16px;
- z-index: 100;
+ z-index: 400;
margin-bottom: 0;
min-height: $header-height;
background-color: $gray-light;
border: none;
border-bottom: 1px solid $border-color;
position: fixed;
- z-index: 300;
top: 0;
left: 0;
right: 0;