diff options
| author | Phil Hughes <me@iamphill.com> | 2019-01-08 11:10:29 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-01-08 11:10:29 +0000 |
| commit | e4c2bf8c1b36377a33d05fd27898c59777e926f7 (patch) | |
| tree | 6ba77c56b5e3f3ca44188c49247489f851d652ac | |
| parent | 30d71ccf5df1d4bd71ce3646ec0f9954a3f68888 (diff) | |
| parent | 177cfc271fcf357fe8244fc0eaf32eb49f2ab15a (diff) | |
| download | gitlab-ce-e4c2bf8c1b36377a33d05fd27898c59777e926f7.tar.gz | |
Merge branch '56019-archived-stuck' into 'master'
Fixes z-index and margins of archived alert
Closes #56019
See merge request gitlab-org/gitlab-ce!24193
| -rw-r--r-- | app/assets/javascripts/jobs/components/job_app.vue | 9 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/builds.scss | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/56019-archived-stuck.yml | 5 |
3 files changed, 14 insertions, 4 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, 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 |