From a35f76199b7e7a4e241eb29ccc798ed3c51ffe2c Mon Sep 17 00:00:00 2001
From: "Luke \"Jared\" Bennett" <lbennett@gitlab.com>
Date: Fri, 19 May 2017 13:57:12 +0100
Subject: [PATCH 1/2] Replaced duplicate z-index with index of 400
---
app/assets/stylesheets/framework/header.scss | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index 65b5f4af037..3c24c5cdd65 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;
margin-bottom: 0;
min-height: $header-height;
background-color: $gray-light;
border: none;
border-bottom: 1px solid $border-color;
position: fixed;
- z-index: 300;
+ z-index: 400;
top: 0;
left: 0;
right: 0;
--
GitLab
From 9b4e40198e4b2426fc4234d7cea18ad4ec72cbd6 Mon Sep 17 00:00:00 2001
From: "Luke \"Jared\" Bennett" <lbennett@gitlab.com>
Date: Fri, 19 May 2017 13:00:44 +0000
Subject: [PATCH 2/2] Place z-index in same place as z-index on EE in
header.scss
---
app/assets/stylesheets/framework/header.scss | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index 3c24c5cdd65..ce8b27a1951 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -24,13 +24,13 @@ header {
&.navbar-gitlab {
padding: 0 16px;
+ 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: 400;
top: 0;
left: 0;
right: 0;
--
GitLab