kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fixes z-index and margins of archived alert

Browse source
This commit is contained in:
Filipa Lacerda 2019-01-07 16:11:50 +00:00
parent ffb384cb12
commit 177cfc271f
3 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/assets/javascripts/jobs/components/job_app.vue
View file

@ -240,14 +240,19 @@ export default {
<div <div
v-if="job.archived" v-if="job.archived"
ref="sticky" 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" /> <icon name="lock" class="align-text-bottom" />
{{ __('This job is archived. Only the complete pipeline can be retried.') }} {{ __('This job is archived. Only the complete pipeline can be retried.') }}
</div> </div>
<!-- job log --> <!-- 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 <log-top-bar
:class="{ :class="{
'sidebar-expanded': isSidebarOpen, 'sidebar-expanded': isSidebarOpen,

4
app/assets/stylesheets/pages/builds.scss
View file

@ -55,16 +55,16 @@
@include build-trace(); @include build-trace();
} }
.archived-sticky { .archived-job {
top: $header-height; top: $header-height;
border-radius: 2px 2px 0 0; border-radius: 2px 2px 0 0;
color: $orange-600; color: $orange-600;
background-color: $orange-100; background-color: $orange-100;
border: 1px solid $border-gray-normal; border: 1px solid $border-gray-normal;
border-bottom: 0;
padding: 3px 12px; padding: 3px 12px;
margin: auto; margin: auto;
align-items: center; align-items: center;
z-index: 1;
.with-performance-bar & { .with-performance-bar & {
top: $header-height + $performance-bar-height; top: $header-height + $performance-bar-height;

5
changelogs/unreleased/56019-archived-stuck.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Fixes z-index and margins of archived alert in job page
merge_request:
author:
type: fixed