Automatic merge of gitlab-org/gitlab-ce master

app/assets/javascripts/jobs/components/job_app.vue

@@ -275,7 +275,7 @@ export default {
         <!-- job log -->
         <div
           v-if="hasTrace"
-          class="build-trace-container"
+          class="build-trace-container position-relative"
           :class="{ 'prepend-top-default': !job.archived }"
         >
           <log-top-bar

app/assets/javascripts/jobs/components/job_container_item.vue

@@ -43,7 +43,7 @@ export default {
 
 <template>
   <div
-    class="build-job"
+    class="build-job position-relative"
     :class="{
       retried: job.retried,
       active: isActive,
@@ -56,7 +56,11 @@ export default {
       data-boundary="viewport"
       class="js-job-link"
     >
-      <icon v-if="isActive" name="arrow-right" class="js-arrow-right icon-arrow-right" />
+      <icon
+        v-if="isActive"
+        name="arrow-right"
+        class="js-arrow-right icon-arrow-right position-absolute d-block"
+      />
 
       <ci-icon :status="job.status" />
 

app/assets/javascripts/jobs/components/job_log_controllers.vue

@@ -75,7 +75,11 @@ export default {
       <template v-if="isTraceSizeVisible">
         {{ jobLogSize }}
 
-        <gl-link v-if="rawPath" :href="rawPath" class="js-raw-link raw-link">
+        <gl-link
+          v-if="rawPath"
+          :href="rawPath"
+          class="js-raw-link text-plain text-underline prepend-left-5"
+        >
           {{ s__('Job|Complete Raw') }}
         </gl-link>
       </template>

app/assets/javascripts/jobs/components/trigger_block.vue

@@ -52,7 +52,7 @@ export default {
     </p>
 
     <template v-if="hasVariables">
-      <p class="trigger-variables-btn-container">
+      <p class="trigger-variables-btn-container d-flex">
         <span class="font-weight-bold">{{ __('Trigger variables:') }}</span>
 
         <gl-button

app/assets/stylesheets/pages/builds.scss

@@ -46,10 +46,6 @@
 }
 
 .build-page {
-  .build-trace-container {
-    position: relative;
-  }
-
   .build-trace {
     @include build-trace();
   }
@@ -104,18 +100,6 @@
       top: 0;
     }
 
-    .truncated-info {
-      .truncated-info-size {
-        margin: 0 5px;
-      }
-
-      .raw-link {
-        color: $gl-text-color;
-        margin-left: 5px;
-        text-decoration: underline;
-      }
-    }
-
     .controllers {
       @include build-controllers(15px, center, false, 0, inline, 0);
     }
@@ -142,12 +126,6 @@
   }
 }
 
-.with-performance-bar .build-page {
-  .top-bar.affix {
-    top: $header-height + $performance-bar-height;
-  }
-}
-
 .build-header {
   .ci-header-container,
   .header-action-buttons {
@@ -233,7 +211,6 @@
   }
 
   .trigger-variables-btn-container {
-    @extend .d-flex;
     justify-content: space-between;
     align-items: center;
 
@@ -277,12 +254,6 @@
   .retry-link {
     display: block;
 
-    .btn {
-      i {
-        margin-left: 5px;
-      }
-    }
-
     .btn-inverted-secondary {
       color: $blue-500;
 
@@ -329,16 +300,12 @@
       }
     }
 
-    .build-job {
-      position: relative;
-
-      .icon-arrow-right {
-        position: absolute;
-        left: 15px;
-        top: 20px;
-        display: block;
-      }
+    .icon-arrow-right {
+      left: 15px;
+      top: 20px;
+    }
 
+    .build-job {
       &.active {
         font-weight: $gl-font-weight-bold;
       }
@@ -350,10 +317,6 @@
       &:hover {
         background-color: $gray-darker;
       }
-
-      .icon-retry {
-        margin-left: 3px;
-      }
     }
   }
 

app/assets/stylesheets/pages/issuable.scss

-// Limit MR description for side-by-side diff view
-.fixed-width-container {
-  @include fixed-width-container;
-}
-
 .issuable-warning-icon {
   background-color: $orange-100;
   border-radius: $border-radius-default;
@@ -27,7 +22,7 @@
   .files-changed-inner,
   .limited-header-width,
   .limited-width-notes {
-    @extend .fixed-width-container;
+    @include fixed-width-container;
   }
 
   .issuable-details {
@@ -35,13 +30,13 @@
     .mr-source-target,
     .mr-state-widget,
     .merge-manually {
-      @extend .fixed-width-container;
+      @include fixed-width-container;
     }
   }
 
   .merge-request-details {
     .emoji-list-container {
-      @extend .fixed-width-container;
+      @include fixed-width-container;
     }
   }
 }