Add latest changes from gitlab-org/gitlab@master

4 files changed, 20 insertions, 3 deletions

diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index 884cb70cb9f..a467d9e8c8a 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -287,6 +287,23 @@
     }
   }
 
+  .non-blocking-loader & {
+    &.is-loading{
+      .dropdown-content {
+        display: block;
+        height: 2rem;
+
+        ul{
+          display: none;
+        }
+      }
+    }
+
+    .dropdown-loading{
+      position: relative;
+    }
+  }
+
   ul {
     margin: 0;
     padding: 0;
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index 5fc06bd2c7b..32735679ded 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -642,7 +642,7 @@ header.navbar-gitlab.super-sidebar-logged-out {
 
     &:focus,
     &:active {
-      box-shadow: inset 0 0 0 $gl-border-size-1 $white;
+      @include gl-focus;
     }
 
     &:active {
diff --git a/app/assets/stylesheets/themes/theme_helper.scss b/app/assets/stylesheets/themes/theme_helper.scss
index 8f0e0781918..95f57f7e406 100644
--- a/app/assets/stylesheets/themes/theme_helper.scss
+++ b/app/assets/stylesheets/themes/theme_helper.scss
@@ -20,7 +20,7 @@
 
   // Header
 
-  .navbar-gitlab {
+  .navbar-gitlab:not(.super-sidebar-logged-out) {
     background-color: $navbar-theme-color;
 
     .navbar-collapse {
diff --git a/app/assets/stylesheets/themes/theme_light_gray.scss b/app/assets/stylesheets/themes/theme_light_gray.scss
index 9b7fc10e769..e8357647f48 100644
--- a/app/assets/stylesheets/themes/theme_light_gray.scss
+++ b/app/assets/stylesheets/themes/theme_light_gray.scss
@@ -10,7 +10,7 @@ body {
       $gray-500
     );
 
-    .navbar-gitlab {
+    .navbar-gitlab:not(.super-sidebar-logged-out) {
       background-color: $gray-50;
       box-shadow: 0 1px 0 0 $border-color;