Merge branch '225895-replace-fa-sign-out-icons-with-gitlab-svg-leave-icon' into 'master'

Replace fa-sign-out icons with GitLab SVG leave/close icon

Closes #225895

See merge request gitlab-org/gitlab!37794

app/views/shared/members/_member.html.haml

@@ -113,18 +113,17 @@
 
         - if member.can_remove?
           - if current_user == user
-            = link_to icon('sign-out', text: _('Leave')), polymorphic_path([:leave, member.source, :members]),
-                      method: :delete,
-                      data: { confirm: leave_confirmation_message(member.source) },
-                      class: "btn btn-remove align-self-center m-0 #{'ml-sm-2' unless force_mobile_view}"
+            = link_to polymorphic_path([:leave, member.source, :members]), method: :delete, data: { confirm: leave_confirmation_message(member.source) }, class: "btn gl-button btn-svg btn-danger align-self-center m-0 #{'ml-sm-2' unless force_mobile_view}" do
+              = sprite_icon('leave', css_class: 'gl-icon')
+              = _('Leave')
           - else
             %button{ data: { member_path: member_path(member.member), message: remove_member_message(member), is_access_request: member.request?.to_s, qa_selector: 'delete_member_button' },
-              class: "js-remove-member-button btn btn-remove align-self-center m-0 #{'ml-sm-2' unless force_mobile_view}",
+              class: "js-remove-member-button btn gl-button btn-danger align-self-center m-0 #{'ml-sm-2 btn-icon' unless force_mobile_view}",
               title: remove_member_title(member) }
               %span{ class: ('d-block d-sm-none' unless force_mobile_view) }
                 = _("Delete")
               - unless force_mobile_view
-                = icon('trash', class: 'd-none d-sm-block')
+                = sprite_icon('remove', css_class: 'd-none d-sm-block gl-icon')
         = render_if_exists 'shared/members/ee/override_member_buttons', group: @group, member: member, user: user, action: :edit, can_override: member.can_override?
       - else
         %span.member-access-text.user-access-role= member.human_access

changelogs/unreleased/225895-replace-fa-sign-out-icons-with-gitlab-svg-leave-icon.yml

+---
+title: Replace fa-sign-out icons with GitLab SVG leave icon
+merge_request: 37794
+author:
+type: changed

ee/app/views/shared/issuable/_remove_approver.html.haml

 %li.unsaved-approvers.hide.approver.approver-template{ id: "user_{user_id}" }
   = link_to "{approver_name}", "#"
   .float-right
-    = link_to "#", data: { confirm: "Are you sure you want to remove approver {approver_name}"}, class: "btn-sm btn btn-remove", title: 'Remove approver' do
-      = icon("sign-out")
-      Remove
+    = link_to "#", data: { confirm: "Are you sure you want to remove approver {approver_name}"}, class: "btn-sm btn btn-danger gl-button", title: _('Remove approver') do
+      = sprite_icon("close", css_class: "gl-icon")
+      = _("Remove")

locale/gitlab.pot

@@ -20168,6 +20168,9 @@ msgstr ""
 msgid "Remove all or specific label(s)"
 msgstr ""
 
+msgid "Remove approver"
+msgstr ""
+
 msgid "Remove approvers"
 msgstr ""
 

spec/features/admin/admin_projects_spec.rb

@@ -126,7 +126,7 @@ RSpec.describe "Admin::Projects" do
         expect(page).to have_content('Developer')
       end
 
-      find(:css, '.content-list li', text: current_user.name).find(:css, 'a.btn-remove').click
+      find(:css, '.content-list li', text: current_user.name).find(:css, 'a.btn-danger').click
 
       expect(page).not_to have_selector(:css, '.content-list')
     end

spec/features/groups/members/manage_members_spec.rb

@@ -69,7 +69,7 @@ RSpec.describe 'Groups > Members > Manage members' do
     visit group_group_members_path(group)
 
     # Open modal
-    find(:css, '.project-members-page li', text: user2.name).find(:css, 'button.btn-remove').click
+    find(:css, '.project-members-page li', text: user2.name).find(:css, 'button.btn-danger').click
 
     expect(page).to have_unchecked_field 'Also unassign this user from related issues and merge requests'
 
@@ -124,7 +124,7 @@ RSpec.describe 'Groups > Members > Manage members' do
       expect(page).not_to have_button 'Developer'
 
       # Can not remove user2
-      expect(page).not_to have_css('a.btn-remove')
+      expect(page).not_to have_css('a.btn-danger')
     end
   end
 

spec/features/projects/members/list_spec.rb

@@ -65,7 +65,7 @@ RSpec.describe 'Project members list' do
     visit_members_page
 
     # Open modal
-    find(:css, 'li.project_member', text: other_user.name).find(:css, 'button.btn-remove').click
+    find(:css, 'li.project_member', text: other_user.name).find(:css, 'button.btn-danger').click
 
     expect(page).to have_unchecked_field 'Also unassign this user from related issues and merge requests'