Commit 4c85d1e5 authored by Sarah Groff Hennigh-Palermo's avatar Sarah Groff Hennigh-Palermo

Merge branch 'mw-replace-fa-refresh' into 'master'

Replace fa icons in CI build table

See merge request gitlab-org/gitlab!45123
parents 90cec854 5e0f0a08
...@@ -28,8 +28,11 @@ ...@@ -28,8 +28,11 @@
height: 14px; height: 14px;
width: 14px; width: 14px;
vertical-align: middle; vertical-align: middle;
&:not(.text-warning) {
fill: $gl-text-color-secondary; fill: $gl-text-color-secondary;
} }
}
.sprite { .sprite {
width: 12px; width: 12px;
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
- if ref - if ref
- if job.ref - if job.ref
.icon-container.gl-display-inline-block .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" = link_to job.ref, project_ref_path(job.project, job.ref), class: "ref-name"
- else - else
.light= _('none') .light= _('none')
...@@ -33,10 +33,12 @@ ...@@ -33,10 +33,12 @@
= link_to job.short_sha, project_commit_path(job.project, job.sha), class: "commit-sha mr-0" = link_to job.short_sha, project_commit_path(job.project, job.sha), class: "commit-sha mr-0"
- if job.stuck? - 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 - 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 .label-container
- if job.tags.any? - if job.tags.any?
...@@ -87,7 +89,7 @@ ...@@ -87,7 +89,7 @@
- if job.finished_at - if job.finished_at
%p.finished-at %p.finished-at
= icon("calendar") = sprite_icon("calendar")
%span= time_ago_with_tooltip(job.finished_at) %span= time_ago_with_tooltip(job.finished_at)
%td.coverage %td.coverage
......
---
title: Replace fa icons in CI build table
merge_request: 45123
author:
type: changed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment