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

1 files changed, 11 insertions, 4 deletions

diff --git a/app/assets/stylesheets/pages/settings.scss b/app/assets/stylesheets/pages/settings.scss
index b82c638a5b7..7b18e3774d8 100644
--- a/app/assets/stylesheets/pages/settings.scss
+++ b/app/assets/stylesheets/pages/settings.scss
@@ -124,8 +124,8 @@
 .settings-message {
   padding: 5px;
   line-height: 1.3;
-  color: $orange-700;
-  background-color: $orange-100;
+  color: $gray-900;
+  background-color: $orange-50;
   border: 1px solid $orange-200;
   border-radius: $border-radius-base;
 }
@@ -135,7 +135,7 @@
 }
 
 .warning-title {
-  color: $orange-500;
+  color: $gray-900;
 }
 
 .danger-title {
@@ -301,7 +301,7 @@
   }
 
   .loading-metrics .metrics-load-spinner {
-    color: $gl-gray-700;
+    color: $gray-700;
   }
 
   .metrics-list {
@@ -384,6 +384,13 @@
         font-weight: $gl-font-weight-bold;
         border: 0;
       }
+
+      // When tables are "stacked", restore td padding
+      @media(max-width: map-get($grid-breakpoints, lg)) {
+        td {
+          padding-left: $gl-spacing-scale-5;
+        }
+      }
     }
   }