Add latest changes from gitlab-org/gitlab@master

2 files changed, 65 insertions, 6 deletions

diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index 2265d425e1f..7c6a3963d75 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -335,11 +335,70 @@
   }
 }
 
-header.navbar-gitlab.super-sidebar-logged-out {
-  background-color: $brand-charcoal !important;
 
-  li.nav-item > button,
-  li.nav-item > a {
+.header-logged-out {
+  z-index: $header-zindex;
+  min-height: var(--header-height);
+  position: fixed;
+  top: $calc-system-headers-height;
+  left: 0;
+  right: 0;
+  background-color: $brand-charcoal;
+}
+
+.header-logged-out-nav {
+  position: relative;
+  min-height: var(--header-height);
+}
+
+.header-logged-out-logo {
+  a {
+    display: flex;
+    align-items: center;
+    padding: 4px;
+    margin-left: -4px;
+    border-radius: $border-radius-default;
+
+    &:hover,
+    &:focus {
+      background-color: $brand-gray-04;
+    }
+
+    &:focus,
+    &:active {
+      @include gl-focus;
+    }
+
+    &:active {
+      background-color: $brand-gray-03;
+    }
+  }
+}
+
+.header-logged-out-toggle {
+  appearance: none;
+  border: 0;
+  background-color: transparent;
+  border-radius: $border-radius-default;
+}
+
+.header-logged-out-dropdown {
+  position: static;
+
+  .dropdown-menu {
+    position: absolute;
+    width: 100%;
+    min-width: 100%;
+  }
+}
+
+.header-logged-out-nav-item {
+  > button,
+  > a {
+    display: inline-block;
+    padding: 6px 8px;
+    height: 32px;
+    border-radius: $border-radius-default;
     @include gl-text-gray-100;
     @include gl-font-weight-normal;
     @include gl-font-base;
@@ -347,7 +406,7 @@ header.navbar-gitlab.super-sidebar-logged-out {
     &:hover,
     &:focus,
     &:active {
-      @include gl-text-white
+      @include gl-text-white;
     }
 
     &:hover,
diff --git a/app/assets/stylesheets/framework/layout.scss b/app/assets/stylesheets/framework/layout.scss
index 6606f5b35a3..7ec13c3d54c 100644
--- a/app/assets/stylesheets/framework/layout.scss
+++ b/app/assets/stylesheets/framework/layout.scss
@@ -154,7 +154,7 @@ body {
   overflow: hidden;
 
   > #js-peek,
-  > .navbar-gitlab {
+  > .header-logged-out {
     position: static;
     top: auto;
   }