Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
177cfc27
Commit
177cfc27
authored
Jan 07, 2019
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes z-index and margins of archived alert
parent
ffb384cb
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
4 deletions
+14
-4
app/assets/javascripts/jobs/components/job_app.vue
app/assets/javascripts/jobs/components/job_app.vue
+7
-2
app/assets/stylesheets/pages/builds.scss
app/assets/stylesheets/pages/builds.scss
+2
-2
changelogs/unreleased/56019-archived-stuck.yml
changelogs/unreleased/56019-archived-stuck.yml
+5
-0
No files found.
app/assets/javascripts/jobs/components/job_app.vue
View file @
177cfc27
...
...
@@ -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,
...
...
app/assets/stylesheets/pages/builds.scss
View file @
177cfc27
...
...
@@ -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
;
...
...
changelogs/unreleased/56019-archived-stuck.yml
0 → 100644
View file @
177cfc27
---
title
:
Fixes z-index and margins of archived alert in job page
merge_request
:
author
:
type
:
fixed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment