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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
5e0f0a08
Commit
5e0f0a08
authored
Oct 14, 2020
by
Martin Wortschack
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace fa icons in CI build table
parent
05ef2590
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
5 deletions
+15
-5
app/assets/stylesheets/pages/pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+4
-1
app/views/projects/ci/builds/_build.html.haml
app/views/projects/ci/builds/_build.html.haml
+6
-4
changelogs/unreleased/mw-replace-fa-refresh.yml
changelogs/unreleased/mw-replace-fa-refresh.yml
+5
-0
No files found.
app/assets/stylesheets/pages/pipelines.scss
View file @
5e0f0a08
...
...
@@ -28,8 +28,11 @@
height
:
14px
;
width
:
14px
;
vertical-align
:
middle
;
&
:not
(
.text-warning
)
{
fill
:
$gl-text-color-secondary
;
}
}
.sprite
{
width
:
12px
;
...
...
app/views/projects/ci/builds/_build.html.haml
View file @
5e0f0a08
...
...
@@ -22,7 +22,7 @@
-
if
ref
-
if
job
.
ref
.icon-container.gl-display-inline-block
=
job
.
tag?
?
icon
(
'tag
'
)
:
sprite_icon
(
'fork'
,
css_class:
'sprite'
)
=
job
.
tag?
?
sprite_icon
(
'label'
,
css_class:
'sprite
'
)
:
sprite_icon
(
'fork'
,
css_class:
'sprite'
)
=
link_to
job
.
ref
,
project_ref_path
(
job
.
project
,
job
.
ref
),
class:
"ref-name"
-
else
.light
=
_
(
'none'
)
...
...
@@ -33,10 +33,12 @@
=
link_to
job
.
short_sha
,
project_commit_path
(
job
.
project
,
job
.
sha
),
class:
"commit-sha mr-0"
-
if
job
.
stuck?
=
icon
(
'warning'
,
class:
'text-warning has-tooltip'
,
title:
_
(
'Job is stuck. Check runners.'
))
%span
.has-tooltip
{
title:
_
(
'Job is stuck. Check runners.'
)
}
=
sprite_icon
(
'warning'
,
css_class:
'text-warning!'
)
-
if
retried
=
icon
(
'refresh'
,
class:
'text-warning has-tooltip'
,
title:
_
(
'Job was retried'
))
%span
.has-tooltip
{
title:
_
(
'Job was retried'
)
}
=
sprite_icon
(
'retry'
,
css_class:
'text-warning'
)
.label-container
-
if
job
.
tags
.
any?
...
...
@@ -87,7 +89,7 @@
-
if
job
.
finished_at
%p
.finished-at
=
icon
(
"calendar"
)
=
sprite_
icon
(
"calendar"
)
%span
=
time_ago_with_tooltip
(
job
.
finished_at
)
%td
.coverage
...
...
changelogs/unreleased/mw-replace-fa-refresh.yml
0 → 100644
View file @
5e0f0a08
---
title
:
Replace fa icons in CI build table
merge_request
:
45123
author
:
type
:
changed
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