diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-08-08 14:24:00 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-08-08 14:24:00 +0000 |
| commit | 2aa460de76840d469071f17df9433c614e700e6e (patch) | |
| tree | 42537cbf55667faa333187d52eb89df63d2bff11 | |
| parent | fafd6a0a0a4da1d99e2233c79bce3baf24447236 (diff) | |
| parent | 5459d4f12da6c790f9d02a211f5419cfada3537f (diff) | |
| download | gitlab-ce-2aa460de76840d469071f17df9433c614e700e6e.tar.gz | |
Merge branch 'header-z-index-fix' into 'master'
Fixed modals being below navbar
See merge request !13355
| -rw-r--r-- | app/assets/stylesheets/framework/header.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/tw_bootstrap_variables.scss | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index d9f92e93160..b677882eba4 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -26,7 +26,7 @@ header { &.navbar-gitlab { padding: 0 16px; - z-index: 2000; + z-index: 1000; margin-bottom: 0; min-height: $header-height; background-color: $gray-light; diff --git a/app/assets/stylesheets/framework/tw_bootstrap_variables.scss b/app/assets/stylesheets/framework/tw_bootstrap_variables.scss index b666223b120..4c35e3a9c3c 100644 --- a/app/assets/stylesheets/framework/tw_bootstrap_variables.scss +++ b/app/assets/stylesheets/framework/tw_bootstrap_variables.scss @@ -162,3 +162,5 @@ $pre-color: $gl-text-color !default; $pre-border-color: $border-color; $table-bg-accent: $gray-light; + +$zindex-popover: 900; |