From 177cfc271fcf357fe8244fc0eaf32eb49f2ab15a Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Mon, 7 Jan 2019 16:11:50 +0000
Subject: [PATCH] Fixes z-index and margins of archived alert

---
 app/assets/javascripts/jobs/components/job_app.vue | 9 +++++++--
 app/assets/stylesheets/pages/builds.scss           | 4 ++--
 changelogs/unreleased/56019-archived-stuck.yml     | 5 +++++
 3 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 changelogs/unreleased/56019-archived-stuck.yml

diff --git a/app/assets/javascripts/jobs/components/job_app.vue b/app/assets/javascripts/jobs/components/job_app.vue
index 786ab16992d..d2b7ce18290 100644
--- a/app/assets/javascripts/jobs/components/job_app.vue
+++ b/app/assets/javascripts/jobs/components/job_app.vue
@@ -240,14 +240,19 @@ export default {
         <div
           v-if="job.archived"
           ref="sticky"
-          class="js-archived-job prepend-top-default archived-sticky sticky-top"
+          class="js-archived-job prepend-top-default archived-job"
+          :class="{ 'sticky-top border-bottom-0': hasTrace }"
         >
           <icon name="lock" class="align-text-bottom" />
 
           {{ __('This job is archived. Only the complete pipeline can be retried.') }}
         </div>
         <!-- job log -->
-        <div v-if="hasTrace" class="build-trace-container">
+        <div
+          v-if="hasTrace"
+          class="build-trace-container"
+          :class="{ 'prepend-top-default': !job.archived }"
+        >
           <log-top-bar
             :class="{
               'sidebar-expanded': isSidebarOpen,
diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss
index 09235661cea..1352a004206 100644
--- a/app/assets/stylesheets/pages/builds.scss
+++ b/app/assets/stylesheets/pages/builds.scss
@@ -55,16 +55,16 @@
     @include build-trace();
   }
 
-  .archived-sticky {
+  .archived-job {
     top: $header-height;
     border-radius: 2px 2px 0 0;
     color: $orange-600;
     background-color: $orange-100;
     border: 1px solid $border-gray-normal;
-    border-bottom: 0;
     padding: 3px 12px;
     margin: auto;
     align-items: center;
+    z-index: 1;
 
     .with-performance-bar & {
       top: $header-height + $performance-bar-height;
diff --git a/changelogs/unreleased/56019-archived-stuck.yml b/changelogs/unreleased/56019-archived-stuck.yml
new file mode 100644
index 00000000000..de3698a327b
--- /dev/null
+++ b/changelogs/unreleased/56019-archived-stuck.yml
@@ -0,0 +1,5 @@
+---
+title: Fixes z-index and margins of archived alert in job page
+merge_request:
+author:
+type: fixed