From e2d01cae083646ae113315d6fd7a008112f6c2b5 Mon Sep 17 00:00:00 2001
From: Sam Beckham <sbeckham@gitlab.com>
Date: Thu, 18 Mar 2021 13:48:11 +0000
Subject: [PATCH] Replaces the success buttons for confirm buttons
This only applies to the previously changed buttons
---
app/views/authentication/_register.html.haml | 2 +-
app/views/jira_connect/users/show.html.haml | 2 +-
app/views/projects/issues/_new_branch.html.haml | 2 +-
app/views/projects/triggers/_form.html.haml | 2 +-
app/views/shared/runners/_form.html.haml | 2 +-
ee/app/views/devise/sessions/_new_smartcard.html.haml | 2 +-
ee/app/views/groups/hooks/edit.html.haml | 2 +-
ee/app/views/groups/hooks/index.html.haml | 2 +-
ee/app/views/groups/ldap_group_settings/_form.html.haml | 2 +-
ee/app/views/groups/saml_providers/_form.html.haml | 2 +-
ee/app/views/groups/sso/_register_pane.html.haml | 4 ++--
ee/app/views/ldap_group_links/_form.html.haml | 2 +-
ee/app/views/registrations/welcome/_button.html.haml | 2 +-
ee/app/views/trials/select.html.haml | 2 +-
ee/app/views/unsubscribes/show.html.haml | 2 +-
15 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/app/views/authentication/_register.html.haml b/app/views/authentication/_register.html.haml
index 6211674347671..9d8a74cf02cc9 100644
--- a/app/views/authentication/_register.html.haml
+++ b/app/views/authentication/_register.html.haml
@@ -33,4 +33,4 @@
= text_field_tag 'device_registration[name]', nil, class: 'form-control', placeholder: _("Pick a name")
.col-md-3
= hidden_field_tag 'device_registration[device_response]', nil, class: 'form-control', required: true, id: "js-device-response"
- = submit_tag _("Register device"), class: "gl-button btn btn-success"
+ = submit_tag _("Register device"), class: "gl-button btn btn-confirm"
diff --git a/app/views/jira_connect/users/show.html.haml b/app/views/jira_connect/users/show.html.haml
index d646ccbb98ae5..cf88acd697630 100644
--- a/app/views/jira_connect/users/show.html.haml
+++ b/app/views/jira_connect/users/show.html.haml
@@ -5,7 +5,7 @@
%p= s_('Integrations|You can now close this window and return to the GitLab for Jira application.')
- if @jira_app_link
- %p= external_link s_('Integrations|Return to GitLab for Jira'), @jira_app_link, class: 'gl-button btn btn-success'
+ %p= external_link s_('Integrations|Return to GitLab for Jira'), @jira_app_link, class: 'gl-button btn btn-confirm'
%p= link_to _('Sign out'), destroy_user_session_path, method: :post
diff --git a/app/views/projects/issues/_new_branch.html.haml b/app/views/projects/issues/_new_branch.html.haml
index 6b681762f375e..45b2f86c03d79 100644
--- a/app/views/projects/issues/_new_branch.html.haml
+++ b/app/views/projects/issues/_new_branch.html.haml
@@ -58,7 +58,7 @@
%span.js-ref-message.form-text.text-muted
.form-group
- %button.btn.gl-button.btn-success.js-create-target{ type: 'button', data: { action: 'create-mr' } }
+ %button.btn.gl-button.btn-confirm.js-create-target{ type: 'button', data: { action: 'create-mr' } }
= create_mr_text
- if can_create_confidential_merge_request?
diff --git a/app/views/projects/triggers/_form.html.haml b/app/views/projects/triggers/_form.html.haml
index c769588b656a7..9043b8e60fcae 100644
--- a/app/views/projects/triggers/_form.html.haml
+++ b/app/views/projects/triggers/_form.html.haml
@@ -8,4 +8,4 @@
.form-group
= f.label :key, "Description", class: "label-bold"
= f.text_field :description, class: 'form-control gl-form-input', required: true, title: 'Trigger description is required.', placeholder: "Trigger description"
- = f.submit btn_text, class: "gl-button btn btn-success"
+ = f.submit btn_text, class: "gl-button btn btn-confirm"
diff --git a/app/views/shared/runners/_form.html.haml b/app/views/shared/runners/_form.html.haml
index 13738c730ce1c..8d0069a7664aa 100644
--- a/app/views/shared/runners/_form.html.haml
+++ b/app/views/shared/runners/_form.html.haml
@@ -59,4 +59,4 @@
.col-sm-10
= f.text_field :private_projects_minutes_cost_factor, class: 'form-control'
.form-actions
- = f.submit _('Save changes'), class: 'gl-button btn btn-success'
+ = f.submit _('Save changes'), class: 'gl-button btn btn-confirm'
diff --git a/ee/app/views/devise/sessions/_new_smartcard.html.haml b/ee/app/views/devise/sessions/_new_smartcard.html.haml
index 889c6d527cbda..317c2c3c60494 100644
--- a/ee/app/views/devise/sessions/_new_smartcard.html.haml
+++ b/ee/app/views/devise/sessions/_new_smartcard.html.haml
@@ -3,4 +3,4 @@
.login-body
= form_tag(auth_smartcard_url, html: { 'aria-live' => 'assertive'}) do
.submit-container
- = submit_tag _('Login with smartcard'), class: 'gl-button btn btn-success'
+ = submit_tag _('Login with smartcard'), class: 'gl-button btn btn-confirm'
diff --git a/ee/app/views/groups/hooks/edit.html.haml b/ee/app/views/groups/hooks/edit.html.haml
index 378cf5ac383df..ebd6d693a0d10 100644
--- a/ee/app/views/groups/hooks/edit.html.haml
+++ b/ee/app/views/groups/hooks/edit.html.haml
@@ -9,6 +9,6 @@
= form_for [@group, @hook], as: :hook, url: group_hook_path(@group, @hook) do |f|
= render partial: 'shared/web_hooks/form', locals: { form: f, hook: @hook }
- %span>= f.submit _('Save changes'), class: 'gl-button btn btn-success gl-mr-3'
+ %span>= f.submit _('Save changes'), class: 'gl-button btn btn-confirm gl-mr-3'
= render 'shared/web_hooks/test_button', hook: @hook
= link_to _('Delete'), group_hook_path(@group, @hook), method: :delete, class: 'gl-button btn btn-danger float-right', data: { confirm: _('Are you sure?') }
diff --git a/ee/app/views/groups/hooks/index.html.haml b/ee/app/views/groups/hooks/index.html.haml
index 98a3d5612aa06..314ad11b024e1 100644
--- a/ee/app/views/groups/hooks/index.html.haml
+++ b/ee/app/views/groups/hooks/index.html.haml
@@ -8,7 +8,7 @@
.col-lg-9.gl-mb-3
= form_for @hook, as: :hook, url: polymorphic_path([@group, :hooks]) do |f|
= render partial: 'shared/web_hooks/form', locals: { form: f, hook: @hook }
- = f.submit _('Add webhook'), class: 'gl-button btn btn-success'
+ = f.submit _('Add webhook'), class: 'gl-button btn btn-confirm'
= render 'shared/web_hooks/index', hooks: @hooks, hook_class: @hook.class
- elsif show_promotions?
diff --git a/ee/app/views/groups/ldap_group_settings/_form.html.haml b/ee/app/views/groups/ldap_group_settings/_form.html.haml
index a868cfe7679f0..70e6a29573934 100644
--- a/ee/app/views/groups/ldap_group_settings/_form.html.haml
+++ b/ee/app/views/groups/ldap_group_settings/_form.html.haml
@@ -8,4 +8,4 @@
= f.label :unlock_membership_to_ldap, class: 'form-check-label' do
= _('Allow owners to manually add users outside of LDAP')
.form-actions
- = f.submit _('Save'), class: 'gl-button btn btn-success qa-save'
+ = f.submit _('Save'), class: 'gl-button btn btn-confirm qa-save'
diff --git a/ee/app/views/groups/saml_providers/_form.html.haml b/ee/app/views/groups/saml_providers/_form.html.haml
index 37d4fa90ae32f..ac657338e4f8b 100644
--- a/ee/app/views/groups/saml_providers/_form.html.haml
+++ b/ee/app/views/groups/saml_providers/_form.html.haml
@@ -63,6 +63,6 @@
= s_('GroupSAML|This will be set as the access level of users added to the group.')
.mt-3
- = f.submit _("Save changes"), class: 'gl-button btn btn-success', data: { qa_selector: 'save_changes_button' }
+ = f.submit _("Save changes"), class: 'gl-button btn btn-confirm', data: { qa_selector: 'save_changes_button' }
#js-saml-test-button.has-tooltip.float-right
= render 'test_button', saml_provider: @saml_provider
diff --git a/ee/app/views/groups/sso/_register_pane.html.haml b/ee/app/views/groups/sso/_register_pane.html.haml
index 6bea5bc9b2016..4d692639d0fd5 100644
--- a/ee/app/views/groups/sso/_register_pane.html.haml
+++ b/ee/app/views/groups/sso/_register_pane.html.haml
@@ -36,7 +36,7 @@
= render 'user_info'
.submit-container
- = f.submit _("Sign out & Register"), class: "btn-success gl-button btn qa-new-user-register-button", data: { qa_selector: 'sign_out_and_register_button' }
+ = f.submit _("Sign out & Register"), class: "btn-confirm gl-button btn qa-new-user-register-button", data: { qa_selector: 'sign_out_and_register_button' }
- else
.submit-container
- = f.submit _("Register"), class: "btn-success gl-button btn qa-new-user-register-button"
+ = f.submit _("Register"), class: "btn-confirm gl-button btn qa-new-user-register-button"
diff --git a/ee/app/views/ldap_group_links/_form.html.haml b/ee/app/views/ldap_group_links/_form.html.haml
index 626dfb8b16b00..c967facbefb11 100644
--- a/ee/app/views/ldap_group_links/_form.html.haml
+++ b/ee/app/views/ldap_group_links/_form.html.haml
@@ -54,4 +54,4 @@
You can manage permission levels for individual group members in the Members tab.
.form-actions.gl-mb-5
- = f.submit 'Add synchronization', class: 'gl-button btn btn-success qa-add-sync-button'
+ = f.submit 'Add synchronization', class: 'gl-button btn btn-confirm qa-add-sync-button'
diff --git a/ee/app/views/registrations/welcome/_button.html.haml b/ee/app/views/registrations/welcome/_button.html.haml
index 628123ca121bc..15210a6fc57da 100644
--- a/ee/app/views/registrations/welcome/_button.html.haml
+++ b/ee/app/views/registrations/welcome/_button.html.haml
@@ -1 +1 @@
-= button_tag welcome_submit_button_text, class: %w[gl-button btn btn-success w-100], data: { qa_selector: 'get_started_button' }
+= button_tag welcome_submit_button_text, class: %w[gl-button btn btn-confirm w-100], data: { qa_selector: 'get_started_button' }
diff --git a/ee/app/views/trials/select.html.haml b/ee/app/views/trials/select.html.haml
index 9ea6e56620cc0..fce37fde8a964 100644
--- a/ee/app/views/trials/select.html.haml
+++ b/ee/app/views/trials/select.html.haml
@@ -29,6 +29,6 @@
.gl-form-checkbox.form-check.form-check-inline
= radio_button_tag :trial_entity, :individual, params[:trial_entity]=='individual', required: true, class: 'form-check-input'
= label_tag :trial_entity_individual, _('No'), class: 'form-check-label'
- = submit_tag _('Start your free trial'), class: 'gl-button btn btn-success btn-block'
+ = submit_tag _('Start your free trial'), class: 'gl-button btn btn-confirm btn-block'
= render 'skip_trial'
diff --git a/ee/app/views/unsubscribes/show.html.haml b/ee/app/views/unsubscribes/show.html.haml
index 58e283f0c0011..8b3dc69f3a7f9 100644
--- a/ee/app/views/unsubscribes/show.html.haml
+++ b/ee/app/views/unsubscribes/show.html.haml
@@ -8,4 +8,4 @@
%strong= @email
from any further admin emails.
.form-actions
- = submit_tag 'Unsubscribe', class: 'gl-button btn btn-success'
+ = submit_tag 'Unsubscribe', class: 'gl-button btn btn-confirm'
--
GitLab