Add latest changes from gitlab-org/gitlab@13-2-stable-ee

3 files changed, 13 insertions, 17 deletions

diff --git a/app/assets/stylesheets/page_bundles/_ide_theme_overrides.scss b/app/assets/stylesheets/page_bundles/_ide_theme_overrides.scss
index 2b82b2226c6..a8d10ea1a29 100644
--- a/app/assets/stylesheets/page_bundles/_ide_theme_overrides.scss
+++ b/app/assets/stylesheets/page_bundles/_ide_theme_overrides.scss
@@ -146,7 +146,7 @@
   }
 
   pre {
-    border-color: var(--ide-border-color-alt, $gray-200);
+    border-color: var(--ide-border-color-alt, $gray-100);
 
     code {
       background-color: var(--ide-border-color, inherit);
@@ -216,7 +216,7 @@
     color: var(--ide-text-color, $gl-text-color);
 
     &:hover {
-      background-color: var(--ide-input-border, $gray-200);
+      background-color: var(--ide-input-border, $gray-100);
     }
   }
 
@@ -300,8 +300,8 @@
     }
 
     .divider {
-      background-color: var(--ide-dropdown-hover-background, $gray-200);
-      border-color: var(--ide-dropdown-hover-background, $gray-200);
+      background-color: var(--ide-dropdown-hover-background, $gray-100);
+      border-color: var(--ide-dropdown-hover-background, $gray-100);
     }
 
     li > a:not(.disable-hover):hover,
@@ -316,7 +316,7 @@
 
   .dropdown-title,
   .dropdown-input {
-    border-color: var(--ide-dropdown-hover-background, $gray-200) !important;
+    border-color: var(--ide-dropdown-hover-background, $gray-100) !important;
   }
 
   .btn-primary,
@@ -356,7 +356,7 @@
 
   .btn[disabled] {
     background-color: var(--ide-btn-default-background, $gray-light) !important;
-    border: 1px solid var(--ide-btn-disabled-border, $gray-200) !important;
+    border: 1px solid var(--ide-btn-disabled-border, $gray-100) !important;
     color: var(--ide-btn-disabled-color, $gl-text-color-disabled) !important;
   }
 
diff --git a/app/assets/stylesheets/page_bundles/ide.scss b/app/assets/stylesheets/page_bundles/ide.scss
index 9c92f891834..a07755724dd 100644
--- a/app/assets/stylesheets/page_bundles/ide.scss
+++ b/app/assets/stylesheets/page_bundles/ide.scss
@@ -145,7 +145,7 @@ $ide-commit-header-height: 48px;
   }
 
   &:not([disabled]):hover {
-    background-color: var(--ide-input-border, $gray-200);
+    background-color: var(--ide-input-border, $gray-100);
   }
 
   &:not([disabled]):focus {
@@ -251,10 +251,6 @@ $ide-commit-header-height: 48px;
     padding-left: $gl-padding;
   }
 }
-
-.ide-status-file {
-  text-align: right;
-}
 // Not great, but this is to deal with our current output
 .multi-file-preview-holder {
   height: 100%;
@@ -400,7 +396,7 @@ $ide-commit-header-height: 48px;
   }
 
   &:active {
-    background: var(--ide-background, $gray-200);
+    background: var(--ide-background, $gray-100);
   }
 
   &.is-active {
@@ -571,7 +567,7 @@ $ide-commit-header-height: 48px;
 
   &:focus {
     color: var(--ide-text-color, $gl-text-color);
-    background-color: var(--ide-background-hover, $gray-200);
+    background-color: var(--ide-background-hover, $gray-100);
   }
 
   &.active {
@@ -1050,7 +1046,7 @@ $ide-commit-header-height: 48px;
   background-color: var(--ide-background, $gray-50);
 
   &:hover {
-    background-color: var(--ide-file-row-btn-hover-background, $gray-200);
+    background-color: var(--ide-file-row-btn-hover-background, $gray-100);
   }
 
   &:active,
@@ -1101,7 +1097,7 @@ $ide-commit-header-height: 48px;
   &:focus {
     outline: 0;
     box-shadow: none;
-    border-color: var(--ide-border-color, $gray-200);
+    border-color: var(--ide-border-color, $gray-100);
   }
 }
 
@@ -1144,7 +1140,7 @@ $ide-commit-header-height: 48px;
 }
 
 .file-row:active {
-  background: var(--ide-background, $gray-200);
+  background: var(--ide-background, $gray-100);
 }
 
 .file-row.is-active {
diff --git a/app/assets/stylesheets/page_bundles/ide_themes/_solarized-dark.scss b/app/assets/stylesheets/page_bundles/ide_themes/_solarized-dark.scss
index a58a0ed9475..0ef0834d8db 100644
--- a/app/assets/stylesheets/page_bundles/ide_themes/_solarized-dark.scss
+++ b/app/assets/stylesheets/page_bundles/ide_themes/_solarized-dark.scss
@@ -47,4 +47,4 @@
 
   --ide-animation-gradient-1: var(--ide-file-row-btn-hover-background);
   --ide-animation-gradient-2: var(--ide-dropdown-hover-background);
-  }
+}