summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/jobs
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2019-01-07 16:11:50 +0000
committerFilipa Lacerda <filipa@gitlab.com>2019-01-08 09:22:47 +0000
commit177cfc271fcf357fe8244fc0eaf32eb49f2ab15a (patch)
tree2968c9ecc5b5bc8bf33ad8e3af8d2a01197f0ffb /app/assets/javascripts/jobs
parentffb384cb125a85c77184a6fda7bbbdbaf89207eb (diff)
downloadgitlab-ce-177cfc271fcf357fe8244fc0eaf32eb49f2ab15a.tar.gz
Fixes z-index and margins of archived alert
Diffstat (limited to 'app/assets/javascripts/jobs')
-rw-r--r--app/assets/javascripts/jobs/components/job_app.vue9
1 files changed, 7 insertions, 2 deletions
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,