diff options
| author | Regis Boudinot <boudinot.regis@yahoo.com> | 2017-05-19 18:31:35 +0000 |
|---|---|---|
| committer | Regis Boudinot <boudinot.regis@yahoo.com> | 2017-05-19 18:31:35 +0000 |
| commit | b9934e7081a28e8ad90e35c9fa380517560e21ce (patch) | |
| tree | 64d70cc00753a5c3d2a0472cb383cd82410af809 | |
| parent | 485bf6bf6216b20c84e39d16d5b90da8955a34ab (diff) | |
| parent | 2f4cdca6f94a51f578b3d067c8c48b9e06b537b4 (diff) | |
| download | gitlab-ce-b9934e7081a28e8ad90e35c9fa380517560e21ce.tar.gz | |
Merge branch '9-2-stable-fix-conflicts-for-mr-11547' into '9-2-stable'
Fix 9.2 conflicts for "Replaced duplicate z-index with index of 400"
See merge request !11557
| -rw-r--r-- | app/assets/stylesheets/framework/header.scss | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index 6d9218310eb..f4ecabd55da 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -24,12 +24,16 @@ 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; + top: 0; + left: 0; + right: 0; @media (max-width: $screen-xs-min) { padding: 0 16px; |