Merge branch 'btn-confirm-shared-members' into 'master'

Move from btn-success to btn-confirm in shared/members directory

See merge request gitlab-org/gitlab!55315

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

@@ -23,4 +23,4 @@
         .clearable-input
           = text_field_tag :expires_at, nil, class: 'form-control js-access-expiration-date-groups', placeholder: _('Expiration date'), id: 'expires_at_groups'
           = sprite_icon('close', size: 16, css_class: 'clear-icon js-clear-input gl-text-gray-200')
-      = submit_tag _("Invite"), class: "btn btn-success", data: { qa_selector: 'invite_group_button' }
+      = submit_tag _("Invite"), class: "gl-button btn btn-confirm gl-mr-3", data: { qa_selector: 'invite_group_button' }

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

@@ -23,6 +23,6 @@
         .clearable-input
           = text_field_tag :expires_at, nil, class: 'form-control js-access-expiration-date', placeholder: 'Expiration date'
           = sprite_icon('close', size: 16, css_class: 'clear-icon js-clear-input gl-text-gray-200')
-      = submit_tag _("Invite"), class: "gl-button btn btn-success", data: { qa_selector: 'invite_member_button' }
+      = submit_tag _("Invite"), class: "gl-button btn btn-confirm gl-mr-3", data: { qa_selector: 'invite_member_button' }
       - if can_import_members
         = link_to _("Import"), import_path, class: "gl-button btn btn-default", title: _("Import members from another project")

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

@@ -107,7 +107,7 @@
         - if member.can_approve?
           = link_to polymorphic_path([:approve_access_request, member]),
                     method: :post,
-                    class: "btn btn-success btn-icon gl-button align-self-center m-0 mb-2 #{'mb-sm-0 ml-sm-2' unless force_mobile_view}",
+                    class: "btn btn-confirm btn-icon gl-button align-self-center m-0 mb-2 #{'mb-sm-0 ml-sm-2' unless force_mobile_view}",
                     title: _('Grant access') do
             %span{ class: ('d-block d-sm-none' unless force_mobile_view) }
               = _('Grant access')

changelogs/unreleased/btn-confirm-shared-members.yml

+---
+title: Move from btn-success to btn-confirm in shared/members directory
+merge_request: 55315
+author: Yogi (@yo)
+type: changed

ee/spec/features/projects/members/invite_group_and_members_spec.rb

@@ -81,7 +81,7 @@ RSpec.describe 'Project > Members > Invite group and members', :js do
 
             select2 group_to_share_with.id, from: '#link_group_id'
             page.find('body').click
-            find('.btn-success').click
+            find('.btn-confirm').click
 
             click_link 'Groups'
 
@@ -123,7 +123,7 @@ RSpec.describe 'Project > Members > Invite group and members', :js do
 
             select2 group_to_share_with.id, from: '#link_group_id'
             page.find('body').click
-            find('.btn-success').click
+            find('.btn-confirm').click
 
             click_link 'Groups'
 

spec/features/projects/members/invite_group_spec.rb

@@ -51,7 +51,7 @@ RSpec.describe 'Project > Members > Invite group', :js do
 
             select2 group_to_share_with.id, from: '#link_group_id'
             page.find('body').click
-            find('.btn-success').click
+            find('.btn-confirm').click
 
             click_link 'Groups'
 
@@ -73,7 +73,7 @@ RSpec.describe 'Project > Members > Invite group', :js do
 
             select2 group_to_share_with.id, from: '#link_group_id'
             page.find('body').click
-            find('.btn-success').click
+            find('.btn-confirm').click
 
             click_link 'Groups'
 
@@ -159,7 +159,7 @@ RSpec.describe 'Project > Members > Invite group', :js do
 
       fill_in 'expires_at_groups', with: 5.days.from_now.strftime('%Y-%m-%d')
       click_on 'invite-group-tab'
-      find('.btn-success').click
+      find('.btn-confirm').click
     end
 
     context 'when `vue_project_members_list` feature flag is enabled' do