Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc42

2 files changed, 3 insertions, 46 deletions

diff --git a/app/assets/stylesheets/themes/_dark.scss b/app/assets/stylesheets/themes/_dark.scss
index d8f74a2913e..11b4bde74a6 100644
--- a/app/assets/stylesheets/themes/_dark.scss
+++ b/app/assets/stylesheets/themes/_dark.scss
@@ -214,6 +214,9 @@ $yiq-text-light: $gray-950;
 $line-added-dark: $green-200;
 $line-removed-dark: $red-200;
 
+$well-expand-item: $gray-200;
+$well-inner-border: $gray-200;
+
 // Misc component overrides that should live elsewhere
 .gl-label {
   filter: brightness(0.9) contrast(1.1);
diff --git a/app/assets/stylesheets/themes/theme_light.scss b/app/assets/stylesheets/themes/theme_light.scss
index 228bff94f5d..b41377475c5 100644
--- a/app/assets/stylesheets/themes/theme_light.scss
+++ b/app/assets/stylesheets/themes/theme_light.scss
@@ -81,50 +81,4 @@ body {
       color: $gray-900;
     }
   }
-
-  &.gl-dark {
-    .logo-text svg {
-      fill: var(--gl-text-color);
-    }
-
-    .navbar-gitlab {
-      background-color: var(--gray-50);
-      box-shadow: 0 1px 0 0 var(--gray-100);
-
-      .navbar-sub-nav,
-      .navbar-nav {
-        li {
-          > a:hover,
-          > a:focus,
-          > button:hover,
-          > button:focus {
-            color: var(--gl-text-color);
-            background-color: var(--gray-200);
-          }
-        }
-
-        li.active,
-        li.dropdown.show {
-          > a,
-          > button {
-            color: var(--gl-text-color);
-            background-color: var(--gray-200);
-          }
-        }
-      }
-
-      .search {
-        form {
-          background-color: var(--gray-100);
-          box-shadow: inset 0 0 0 1px var(--border-color);
-
-          &:active,
-          &:hover {
-            background-color: var(--gray-100);
-            box-shadow: inset 0 0 0 1px var(--blue-200);
-          }
-        }
-      }
-    }
-  }
 }