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
525a19ec
Commit
525a19ec
authored
Oct 15, 2020
by
Martin Wortschack
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace fa-calendar icon with GitLab SVG
- Replaces the Fontawesome calendar icon with the GitLab calendar SVG
parent
75b936d9
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
13 additions
and
11 deletions
+13
-11
app/assets/javascripts/issues_list/components/issuable.vue
app/assets/javascripts/issues_list/components/issuable.vue
+1
-1
app/assets/stylesheets/fontawesome_custom.scss
app/assets/stylesheets/fontawesome_custom.scss
+0
-4
app/views/projects/artifacts/_artifact.html.haml
app/views/projects/artifacts/_artifact.html.haml
+2
-2
app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
.../generic_commit_statuses/_generic_commit_status.html.haml
+1
-1
app/views/projects/issues/_issue.html.haml
app/views/projects/issues/_issue.html.haml
+1
-1
app/views/shared/milestones/_sidebar.html.haml
app/views/shared/milestones/_sidebar.html.haml
+2
-1
changelogs/unreleased/225952-replace-fa-calendar-icons-with-gitlab-svg-calendar-icon.yml
...place-fa-calendar-icons-with-gitlab-svg-calendar-icon.yml
+5
-0
spec/frontend/vue_shared/components/sidebar/collapsed_calendar_icon_spec.js
...shared/components/sidebar/collapsed_calendar_icon_spec.js
+1
-1
No files found.
app/assets/javascripts/issues_list/components/issuable.vue
View file @
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>
...
...
app/assets/stylesheets/fontawesome_custom.scss
View file @
525a19ec
...
@@ -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'
;
}
}
...
...
app/views/projects/artifacts/_artifact.html.haml
View file @
525a19ec
...
@@ -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
...
...
app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
View file @
525a19ec
...
@@ -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
...
...
app/views/projects/issues/_issue.html.haml
View file @
525a19ec
...
@@ -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'
)
}
=
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?
...
...
app/views/shared/milestones/_sidebar.html.haml
View file @
525a19ec
...
@@ -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
...
...
changelogs/unreleased/225952-replace-fa-calendar-icons-with-gitlab-svg-calendar-icon.yml
0 → 100644
View file @
525a19ec
---
title
:
Replace fa-calendar icon with GitLab SVG
merge_request
:
45175
author
:
type
:
changed
spec/frontend/vue_shared/components/sidebar/collapsed_calendar_icon_spec.js
View file @
525a19ec
...
@@ -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
'
,
()
=>
{
...
...
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