Commit 17864ee8 authored by Tim Zallmann's avatar Tim Zallmann

Merge branch '225952-replace-fa-calendar-icons-with-gitlab-svg-calendar-icon' into 'master'

Replace fa-calendar icons with GitLab SVG calendar icon

See merge request gitlab-org/gitlab!45175
parents 5293406d 525a19ec
...@@ -351,7 +351,7 @@ export default { ...@@ -351,7 +351,7 @@ export default {
:class="{ cred: isOverdue }" :class="{ cred: isOverdue }"
:title="__('Due date')" :title="__('Due date')"
> >
<i class="fa fa-calendar"></i> <gl-icon name="calendar" />
{{ dueDateWords }} {{ dueDateWords }}
</span> </span>
......
...@@ -109,10 +109,6 @@ ...@@ -109,10 +109,6 @@
content: '\f110'; content: '\f110';
} }
.fa-calendar::before {
content: '\f073';
}
.fa-angle-double-right::before { .fa-angle-double-right::before {
content: '\f101'; content: '\f101';
} }
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
.table-mobile-header{ role: 'rowheader' }= _('Creation date') .table-mobile-header{ role: 'rowheader' }= _('Creation date')
.table-mobile-content .table-mobile-content
%p.finished-at %p.finished-at
= icon("calendar") = sprite_icon("calendar")
%span= time_ago_with_tooltip(artifact.created_at) %span= time_ago_with_tooltip(artifact.created_at)
.table-section.section-20 .table-section.section-20
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
.table-mobile-content .table-mobile-content
- if artifact.expire_at - if artifact.expire_at
%p.finished-at %p.finished-at
= icon("calendar") = sprite_icon("calendar")
%span= time_ago_with_tooltip(artifact.expire_at) %span= time_ago_with_tooltip(artifact.expire_at)
.table-section.section-10 .table-section.section-10
......
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
- if generic_commit_status.finished_at - if generic_commit_status.finished_at
%p.finished-at %p.finished-at
= icon("calendar") = sprite_icon("calendar")
%span= time_ago_with_tooltip(generic_commit_status.finished_at) %span= time_ago_with_tooltip(generic_commit_status.finished_at)
%td.coverage %td.coverage
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
- if issue.due_date - if issue.due_date
%span.issuable-due-date.d-none.d-sm-inline-block.has-tooltip{ class: "#{'cred' if issue.overdue?}", title: _('Due date') } %span.issuable-due-date.d-none.d-sm-inline-block.has-tooltip{ class: "#{'cred' if issue.overdue?}", title: _('Due date') }
&nbsp; &nbsp;
= icon('calendar') = sprite_icon('calendar')
= issue.due_date.to_s(:medium) = issue.due_date.to_s(:medium)
- if issue.labels.any? - if issue.labels.any?
&nbsp; &nbsp;
......
...@@ -32,7 +32,8 @@ ...@@ -32,7 +32,8 @@
.block.due_date .block.due_date
.sidebar-collapsed-icon .sidebar-collapsed-icon
= icon('calendar', 'aria-hidden': 'true') %span{ 'aria-hidden': 'true' }
= sprite_icon('calendar')
%span.collapsed-milestone-date %span.collapsed-milestone-date
- if milestone.start_date && milestone.due_date - if milestone.start_date && milestone.due_date
- if milestone.start_date.year == milestone.due_date.year - if milestone.start_date.year == milestone.due_date.year
......
---
title: Replace fa-calendar icon with GitLab SVG
merge_request: 45175
author:
type: changed
...@@ -18,7 +18,7 @@ describe('collapsedCalendarIcon', () => { ...@@ -18,7 +18,7 @@ describe('collapsedCalendarIcon', () => {
}); });
it('should hide calendar icon if showIcon', () => { it('should hide calendar icon if showIcon', () => {
expect(vm.$el.querySelector('.fa-calendar')).toBeNull(); expect(vm.$el.querySelector('[data-testid="calendar-icon"]')).toBeNull();
}); });
it('should render text', () => { it('should render text', () => {
......
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