Add latest changes from gitlab-org/gitlab@master

7 files changed, 20 insertions, 12 deletions

diff --git a/app/assets/stylesheets/framework/broadcast_messages.scss b/app/assets/stylesheets/framework/broadcast_messages.scss
index 90a7e2c2da7..a0bfca79dc3 100644
--- a/app/assets/stylesheets/framework/broadcast_messages.scss
+++ b/app/assets/stylesheets/framework/broadcast_messages.scss
@@ -14,8 +14,6 @@
 }
 
 .broadcast-banner-message {
-  text-align: center;
-
   p {
     margin-bottom: 0;
   }
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index f44123fc2ed..12b4d3ac0cc 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -71,7 +71,7 @@
         display: flex;
         align-items: center;
         padding: 2px 8px;
-        margin: 5px 2px 5px -8px;
+        margin: 5px 2px 5px -12px;
         border-radius: $border-radius-default;
       }
 
@@ -127,7 +127,7 @@
       border-radius: 0;
       min-width: 45px;
       padding: 0;
-      margin: $gl-padding-8 -7px $gl-padding-8 0;
+      margin: $gl-padding-8 $gl-padding-8 $gl-padding-8 0;
       font-size: 14px;
       text-align: center;
       color: currentColor;
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index d270f802c56..87dac85d4cd 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -71,7 +71,7 @@
 }
 
 .right-sidebar {
-  border-left: 1px solid $border-color;
+  border-left: 1px solid $gray-50;
 
   .sidebar-container,
   .issuable-sidebar {
@@ -135,7 +135,11 @@
   // rest of the sidebar, and could be removed once the sidebar has been fully converted to use
   // gitlab-ui components.
   .title .gl-button {
-    color: $gl-text-color;
+    font-weight: $gl-font-weight-bold;
+
+    .gl-button {
+      color: $gl-text-color;
+    }
   }
 }
 
diff --git a/app/assets/stylesheets/page_bundles/_pipeline_mixins.scss b/app/assets/stylesheets/page_bundles/_pipeline_mixins.scss
index ee777820b81..594800c84fd 100644
--- a/app/assets/stylesheets/page_bundles/_pipeline_mixins.scss
+++ b/app/assets/stylesheets/page_bundles/_pipeline_mixins.scss
@@ -94,7 +94,14 @@
   &.ci-status-icon-scheduled,
   &.ci-status-icon-disabled,
   &.ci-status-icon-manual {
-    @include mini-pipeline-graph-color(var(--white, $white), $gray-500, $gray-700, $gray-900, $gray-950, $black);
+    @include mini-pipeline-graph-color(
+      var(--white, $white),
+      var(--gray-500, $gray-500),
+      var(--gray-700, $gray-700),
+      var(--gray-900, $gray-900),
+      var(--gray-950, $gray-950),
+      var(--black, $black)
+    );
   }
 
   &.ci-status-icon-preparing,
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index c00af802c06..202e65bdeec 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -130,7 +130,6 @@
   bottom: var(--review-bar-height, 0px);
   right: 0;
   transition: width $sidebar-transition-duration;
-  background: $gray-light;
   z-index: 200;
   overflow: hidden;
 
diff --git a/app/assets/stylesheets/startup/startup-dark.scss b/app/assets/stylesheets/startup/startup-dark.scss
index 62d45332204..8e5ff794f28 100644
--- a/app/assets/stylesheets/startup/startup-dark.scss
+++ b/app/assets/stylesheets/startup/startup-dark.scss
@@ -817,7 +817,7 @@ input {
   display: flex;
   align-items: center;
   padding: 2px 8px;
-  margin: 5px 2px 5px -8px;
+  margin: 5px 2px 5px -12px;
   border-radius: 4px;
 }
 .navbar-gitlab .header-content .navbar-collapse > ul.nav > li:not(.d-none) {
@@ -853,7 +853,7 @@ input {
   border-radius: 0;
   min-width: 45px;
   padding: 0;
-  margin: 8px -7px 8px 0;
+  margin: 8px 8px 8px 0;
   font-size: 14px;
   text-align: center;
   color: currentColor;
diff --git a/app/assets/stylesheets/startup/startup-general.scss b/app/assets/stylesheets/startup/startup-general.scss
index a8b7299b935..61d1b055d02 100644
--- a/app/assets/stylesheets/startup/startup-general.scss
+++ b/app/assets/stylesheets/startup/startup-general.scss
@@ -803,7 +803,7 @@ input {
   display: flex;
   align-items: center;
   padding: 2px 8px;
-  margin: 5px 2px 5px -8px;
+  margin: 5px 2px 5px -12px;
   border-radius: 4px;
 }
 .navbar-gitlab .header-content .navbar-collapse > ul.nav > li:not(.d-none) {
@@ -839,7 +839,7 @@ input {
   border-radius: 0;
   min-width: 45px;
   padding: 0;
-  margin: 8px -7px 8px 0;
+  margin: 8px 8px 8px 0;
   font-size: 14px;
   text-align: center;
   color: currentColor;