Add latest changes from gitlab-org/gitlab@master

3 files changed, 5 insertions, 2 deletions

diff --git a/app/assets/stylesheets/framework/job_log.scss b/app/assets/stylesheets/framework/job_log.scss
index f77f64f1d76..e409facd081 100644
--- a/app/assets/stylesheets/framework/job_log.scss
+++ b/app/assets/stylesheets/framework/job_log.scss
@@ -6,7 +6,7 @@
   word-break: break-all;
   word-wrap: break-word;
   color: color-yiq($builds-log-bg);
-  border-radius: $border-radius-small;
+  border-radius: 0 0 $border-radius-default $border-radius-default;
   min-height: 42px;
   background-color: $builds-log-bg;
 }
diff --git a/app/assets/stylesheets/framework/mixins.scss b/app/assets/stylesheets/framework/mixins.scss
index edebe9c95ad..a32663b17d3 100644
--- a/app/assets/stylesheets/framework/mixins.scss
+++ b/app/assets/stylesheets/framework/mixins.scss
@@ -263,7 +263,7 @@
 @mixin build-log-top-bar($height) {
   @include build-log-bar($height);
   position: sticky;
-  top: $calc-application-header-height;
+  top: calc(#{$calc-application-header-height} - 1px);
 }
 
 /*
diff --git a/app/assets/stylesheets/page_bundles/build.scss b/app/assets/stylesheets/page_bundles/build.scss
index 5114f484e53..4f968197d4e 100644
--- a/app/assets/stylesheets/page_bundles/build.scss
+++ b/app/assets/stylesheets/page_bundles/build.scss
@@ -15,6 +15,9 @@
 
   .top-bar {
     @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);
 
     &.has-archived-block {
       top: calc(#{$calc-application-header-height} + 28px);