Merge branch 'remove-fa-heart' into 'master'

Replace heart icon See merge request gitlab-org/gitlab!34777

Merge branch 'remove-fa-heart' into 'master'
Replace heart icon See merge request gitlab-org/gitlab!34777
a3516b85 · Andrew Fontaine · f15bcb20 · 64426806 · a3516b85 · a3516b85
Commit a3516b85 authored Jun 18, 2020 by Andrew Fontaine
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

app/views/import/gitlab/status.html.haml app/views/import/gitlab/status.html.haml +1 -1

changelogs/unreleased/remove-fa-heart.yml changelogs/unreleased/remove-fa-heart.yml +5 -0

No files found.
--- a/app/views/import/gitlab/status.html.haml
+++ b/app/views/import/gitlab/status.html.haml
 - page_title _("GitLab.com import")
 - header_title _("Projects"), root_path
 %h3.page-title
-  %i.fa.fa-heart
+  = sprite_icon('heart', size: 16, css_class: 'gl-vertical-align-middle')
  = _('Import projects from GitLab.com')
 - if Feature.enabled?(:new_import_ui)

--- a/changelogs/unreleased/remove-fa-heart.yml
+++ b/changelogs/unreleased/remove-fa-heart.yml
+---
+title: Update heart icon from FontAwesome to GitLab SVG
+merge_request: 34777
+author:
+type: other