diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-31 15:07:53 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-31 15:07:53 +0000 |
| commit | d7a028e20d29b8c6d0e780ac168544dfbb712d3c (patch) | |
| tree | f9fc9ea12e166aec6c4ffe476ba7a3566396b696 /app/assets/stylesheets | |
| parent | 0d0cddc9ce20c5a7d8a2723d0aa620ca184a711a (diff) | |
| download | gitlab-ce-d7a028e20d29b8c6d0e780ac168544dfbb712d3c.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/stylesheets')
| -rw-r--r-- | app/assets/stylesheets/framework/header.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/editor.scss | 4 |
3 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index 3792e6cb0a6..a0a020ec548 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -1,6 +1,6 @@ .navbar-gitlab { padding: 0 16px; - z-index: 1000; + z-index: $header-zindex; margin-bottom: 0; min-height: $header-height; border: 0; diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index b4ed6587fca..a3c1d8b1709 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -418,6 +418,7 @@ $browser-scrollbar-size: 10px; * Misc */ $header-height: 40px; +$header-zindex: 1000; $suggestion-header-height: 46px; $ide-statusbar-height: 25px; $fixed-layout-width: 1280px; diff --git a/app/assets/stylesheets/pages/editor.scss b/app/assets/stylesheets/pages/editor.scss index b716c6e14fe..eb9684c7b3c 100644 --- a/app/assets/stylesheets/pages/editor.scss +++ b/app/assets/stylesheets/pages/editor.scss @@ -221,3 +221,7 @@ .editor-title-row { margin-bottom: 20px; } + +.popover.suggest-gitlab-ci-yml { + z-index: $header-zindex - 1; +} |