Add latest changes from gitlab-org/gitlab@master

4 files changed, 26 insertions, 6 deletions

diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss
index 764a4169da0..5dae64653ac 100644
--- a/app/assets/stylesheets/framework/common.scss
+++ b/app/assets/stylesheets/framework/common.scss
@@ -43,7 +43,8 @@
   .right-sidebar-collapsed {
     --application-bar-right: #{$right-sidebar-collapsed-width};
 
-    &.is-merge-request {
+    &.is-merge-request,
+    &.build-sidebar {
       --application-bar-right: 0px;
     }
   }
@@ -51,6 +52,10 @@
   .right-sidebar-expanded {
     --application-bar-right: #{$right-sidebar-width};
   }
+
+  .build-sidebar {
+    --application-bar-right: 0px;
+  }
 }
 
 @include media-breakpoint-up(md) {
diff --git a/app/assets/stylesheets/framework/mixins.scss b/app/assets/stylesheets/framework/mixins.scss
index a32663b17d3..df107798a87 100644
--- a/app/assets/stylesheets/framework/mixins.scss
+++ b/app/assets/stylesheets/framework/mixins.scss
@@ -254,7 +254,7 @@
 @mixin build-log-bar($height) {
   height: $height;
   min-height: $height;
-  background: var(--gray-50, $gray-50);
+  background: var(--white, $white);
   border: 1px solid var(--border-color, $border-color);
   color: var(--gl-text-color, $gl-text-color);
   padding: $grid-size;
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index f2afa94e000..9c31559cc0e 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -73,13 +73,21 @@
     }
   }
 
-  &:not(.is-merge-request) {
+  &:not(.is-merge-request):not(.build-sidebar) {
     @include media-breakpoint-up(md) {
       .content-wrapper {
         padding-right: $right-sidebar-width;
       }
     }
   }
+
+  &.build-sidebar {
+    @include media-breakpoint-up(lg) {
+      .content-wrapper {
+        padding-right: $right-sidebar-width;
+      }
+    }
+  }
 }
 
 .right-sidebar {
diff --git a/app/assets/stylesheets/page_bundles/build.scss b/app/assets/stylesheets/page_bundles/build.scss
index a06a1513f7d..24bd8b0fd7f 100644
--- a/app/assets/stylesheets/page_bundles/build.scss
+++ b/app/assets/stylesheets/page_bundles/build.scss
@@ -17,7 +17,7 @@
     @include build-log-top-bar(50px);
     z-index: 2;
     border-radius: $border-radius-default $border-radius-default 0 0;
-    box-shadow: 0 -2px 0 0 var(--white);
+    box-shadow: 0 -4px 0 0 var(--white);
 
     &.has-archived-block {
       top: calc(#{$calc-application-header-height} + 28px);
@@ -89,13 +89,20 @@
 }
 
 .right-sidebar.build-sidebar {
+  padding: 0;
+
+  @include media-breakpoint-up(lg) {
+    @include gl-border-l-0;
+  }
+
   &.right-sidebar-collapsed {
     display: none;
   }
 
   .sidebar-container {
-    padding-right: 100px;
-    height: 100%;
+    @include gl-sticky;
+    top: #{$top-bar-height - 1px};
+    max-height: calc(100vh - #{$top-bar-height - 1px});
     overflow-y: scroll;
     overflow-x: hidden;
     -webkit-overflow-scrolling: touch;