Commit 6c00ffc5 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch '225187-replace-fa-comment-icons-with-gitlab-svg-comment-icon' into 'master'

Replace fa-comment / fa-comments icons with GitLab SVG

See merge request gitlab-org/gitlab!36206
parents 8406dd97 007a9639
......@@ -365,7 +365,7 @@ export default {
:title="__('Comments')"
:class="{ 'no-comments': hasNoComments }"
>
<i class="fa fa-comments"></i>
<gl-icon name="comments" class="gl-vertical-align-text-bottom" />
{{ userNotesCount }}
</gl-link>
</div>
......
......@@ -4,7 +4,7 @@
.search-result-row
%h5.note-search-caption.str-truncated
%i.fa.fa-comment
= sprite_icon('comment', size: 16, css_class: 'gl-vertical-align-text-bottom')
= link_to_member(project, note.author, avatar: false)
- link_to_project = link_to(project.full_name, project)
= _("commented on %{link_to_project}").html_safe % { link_to_project: link_to_project }
......
......@@ -21,5 +21,5 @@
%li.issuable-comments.d-none.d-sm-block
= link_to issuable_path, class: ['has-tooltip', ('no-comments' if note_count.zero?)], title: _('Comments') do
= icon('comments')
= sprite_icon('comments', size: 16, css_class: 'gl-vertical-align-text-bottom')
= note_count
......@@ -11,7 +11,7 @@
%ul.controls
%li
= link_to gitlab_snippet_path(snippet, anchor: 'notes'), class: ('no-comments' if notes_count.zero?) do
= icon('comments')
= sprite_icon('comments', size: 16, css_class: 'gl-vertical-align-text-bottom')
= notes_count
%li
%span.sr-only
......
---
title: Replace fa-comment / fa-comments icons with GitLab SVG
merge_request: 36206
author:
type: changed
......@@ -30,7 +30,7 @@ RSpec.describe 'issuable list', :js do
expect(first('.issuable-upvotes')).to have_content(1)
expect(first('.issuable-downvotes')).to have_content(1)
expect(first('.fa-comments').find(:xpath, '..')).to have_content(2)
expect(first('.issuable-comments')).to have_content(2)
end
it 'sorts labels alphabetically' do
......
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