diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-05-19 14:55:49 +0000 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2017-05-19 16:37:18 +0000 |
| commit | 06867f30598eaed32e03a6af0139482418df878a (patch) | |
| tree | ffa2df85f8bf9e5e0f4ea09f3a8e34cf8f9cc48c | |
| parent | 441f37f23bc2aa2669107d6bc8bed86046e225f4 (diff) | |
| download | gitlab-ce-9-2-stable-fix-conflicts-for-mr-11547.tar.gz | |
Merge branch 'fix-header-z-index' into 'master'9-2-stable-fix-conflicts-for-mr-11547
Replaced duplicate z-index with index of 400
Closes #32609
See merge request !11547
Conflicts:
app/assets/stylesheets/framework/header.scss
| -rw-r--r-- | app/assets/stylesheets/framework/header.scss | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index 6d9218310eb..14d71342fb1 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -24,12 +24,19 @@ 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; +<<<<<<< HEAD +======= + position: fixed; + top: 0; + left: 0; + right: 0; +>>>>>>> 3c45906... Merge branch 'fix-header-z-index' into 'master' @media (max-width: $screen-xs-min) { padding: 0 16px; |