Commit 5333ef36 authored by Yogi's avatar Yogi Committed by Jose Ivan Vargas

Move btn-primary to btn-confirm class as a part of Pajamas migration

This changes the trigger repository check button to be pajamas compliant
parent a32e201d
...@@ -165,7 +165,7 @@ export default { ...@@ -165,7 +165,7 @@ export default {
</p> </p>
<a <a
:href="links.webIDEHelpPagePath" :href="links.webIDEHelpPagePath"
class="btn btn-primary" class="btn gl-button btn-confirm"
target="_blank" target="_blank"
rel="noopener noreferrer" rel="noopener noreferrer"
> >
......
...@@ -45,5 +45,5 @@ ...@@ -45,5 +45,5 @@
= render "shared/tokens/scopes_list", token: @application = render "shared/tokens/scopes_list", token: @application
.form-actions .form-actions
= link_to 'Edit', edit_admin_application_path(@application), class: 'gl-button btn btn-primary wide float-left' = link_to 'Edit', edit_admin_application_path(@application), class: 'gl-button btn btn-confirm wide float-left'
= render 'delete_form', application: @application, submit_btn_css: 'btn btn-danger gl-ml-3' = render 'delete_form', application: @application, submit_btn_css: 'gl-button btn btn-danger gl-ml-3'
...@@ -32,6 +32,6 @@ ...@@ -32,6 +32,6 @@
= render 'shared/projects/dropdown' = render 'shared/projects/dropdown'
= link_to new_project_path, class: 'gl-button btn btn-success' do = link_to new_project_path, class: 'gl-button btn btn-success' do
New Project New Project
= button_tag "Search", class: "gl-button btn btn-primary btn-search hide" = button_tag "Search", class: "gl-button btn btn-confirm btn-search hide"
= render 'projects' = render 'projects'
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
.form-group.row .form-group.row
.offset-sm-3.col-sm-9 .offset-sm-3.col-sm-9
= f.submit _('Transfer'), class: 'gl-button btn btn-primary' = f.submit _('Transfer'), class: 'gl-button btn btn-confirm'
.card.repository-check .card.repository-check
.card-header .card-header
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
= link_to sprite_icon('question-o'), help_page_path('administration/repository_checks') = link_to sprite_icon('question-o'), help_page_path('administration/repository_checks')
.form-group .form-group
= f.submit _('Trigger repository check'), class: 'gl-button btn btn-primary' = f.submit _('Trigger repository check'), class: 'gl-button btn btn-confirm'
.col-md-6 .col-md-6
- if @group - if @group
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
= f.label 'Confirm new password', for: "user_password_confirmation" = f.label 'Confirm new password', for: "user_password_confirmation"
= f.password_field :password_confirmation, class: "form-control gl-form-input bottom", title: 'This field is required', data: { qa_selector: 'password_confirmation_field' }, required: true = f.password_field :password_confirmation, class: "form-control gl-form-input bottom", title: 'This field is required', data: { qa_selector: 'password_confirmation_field' }, required: true
.clearfix .clearfix
= f.submit "Change your password", class: "gl-button btn btn-info", data: { qa_selector: 'change_password_button' } = f.submit "Change your password", class: "gl-button btn btn-confirm", data: { qa_selector: 'change_password_button' }
.clearfix.prepend-top-20 .clearfix.prepend-top-20
%p %p
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
= f.label :email = f.label :email
= f.email_field :email, class: "form-control gl-form-input", required: true, value: params[:user_email], autofocus: true, title: 'Please provide a valid email address.' = f.email_field :email, class: "form-control gl-form-input", required: true, value: params[:user_email], autofocus: true, title: 'Please provide a valid email address.'
.clearfix .clearfix
= f.submit "Reset password", class: "gl-button btn-info btn" = f.submit "Reset password", class: "gl-button btn-confirm btn"
.clearfix.prepend-top-20 .clearfix.prepend-top-20
= render 'devise/shared/sign_in_link' = render 'devise/shared/sign_in_link'
...@@ -43,5 +43,5 @@ ...@@ -43,5 +43,5 @@
= render "shared/tokens/scopes_list", token: @application = render "shared/tokens/scopes_list", token: @application
.form-actions .form-actions
= link_to _('Edit'), edit_oauth_application_path(@application), class: 'gl-button btn btn-primary wide float-left' = link_to _('Edit'), edit_oauth_application_path(@application), class: 'gl-button btn btn-confirm wide float-left'
= render 'delete_form', application: @application, submit_btn_css: 'btn btn-danger gl-ml-3' = render 'delete_form', application: @application, submit_btn_css: 'gl-button btn btn-danger gl-ml-3'
...@@ -141,12 +141,12 @@ ...@@ -141,12 +141,12 @@
%img.modal-profile-crop-image{ alt: s_("Profiles|Avatar cropper") } %img.modal-profile-crop-image{ alt: s_("Profiles|Avatar cropper") }
.crop-controls .crop-controls
.btn-group .btn-group
%button.btn.btn-primary{ data: { method: 'zoom', option: '-0.1' } } %button.btn.gl-button.btn-confirm{ data: { method: 'zoom', option: '-0.1' } }
%span %span
= sprite_icon('search-minus') = sprite_icon('search-minus')
%button.btn.btn-primary{ data: { method: 'zoom', option: '0.1' } } %button.btn.gl-button.btn-confirm{ data: { method: 'zoom', option: '0.1' } }
%span %span
= sprite_icon('search-plus') = sprite_icon('search-plus')
.modal-footer .modal-footer
%button.btn.btn-primary.js-upload-user-avatar{ type: 'button' } %button.btn.gl-button.btn-confirm.js-upload-user-avatar{ type: 'button' }
= s_("Profiles|Set new profile picture") = s_("Profiles|Set new profile picture")
.btn-group.ml-0.w-100 .btn-group.ml-0.w-100
- Gitlab::Workhorse::ARCHIVE_FORMATS.each_with_index do |fmt, index| - Gitlab::Workhorse::ARCHIVE_FORMATS.each_with_index do |fmt, index|
- archive_path = project_archive_path(project, id: tree_join(ref, archive_prefix), path: path, format: fmt) - archive_path = project_archive_path(project, id: tree_join(ref, archive_prefix), path: path, format: fmt)
= link_to fmt, external_storage_url_or_path(archive_path), rel: 'nofollow', download: '', class: "gl-button btn btn-xs #{"btn-primary" if index == 0}" = link_to fmt, external_storage_url_or_path(archive_path), rel: 'nofollow', download: '', class: "gl-button btn btn-xs #{"btn-confirm" if index == 0}"
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
- if @project&.context_commits_enabled? && can_update_merge_request - if @project&.context_commits_enabled? && can_update_merge_request
%p %p
= _('Push commits to the source branch or add previously merged commits to review them.') = _('Push commits to the source branch or add previously merged commits to review them.')
%button.btn.btn-primary.add-review-item-modal-trigger{ type: "button", data: { commits_empty: 'true', context_commits_empty: 'true' } } %button.btn.gl-button.btn-confirm.add-review-item-modal-trigger{ type: "button", data: { commits_empty: 'true', context_commits_empty: 'true' } }
= _('Add previously merged commits') = _('Add previously merged commits')
- else - else
%ol#commits-list.list-unstyled %ol#commits-list.list-unstyled
......
...@@ -15,5 +15,5 @@ ...@@ -15,5 +15,5 @@
%p %p
= link_to _('Unsubscribe'), unsubscribe_sent_notification_path(@sent_notification, force: true), = link_to _('Unsubscribe'), unsubscribe_sent_notification_path(@sent_notification, force: true),
class: 'gl-button btn btn-primary gl-mr-3' class: 'gl-button btn btn-confirm gl-mr-3'
= link_to _('Cancel'), new_user_session_path, class: 'gl-button btn gl-mr-3' = link_to _('Cancel'), new_user_session_path, class: 'gl-button btn gl-mr-3'
---
title: Move btn-primary to btn-confirm class as a part of Pajamas migration
merge_request: 52090
author: Yogi (@yo)
type: changed
...@@ -25,4 +25,4 @@ ...@@ -25,4 +25,4 @@
= license_key = license_key
.modal-footer.form-actions .modal-footer.form-actions
%button.btn.gl-button.btn-default{ type: 'button', data: { dismiss: 'modal' } } Cancel %button.btn.gl-button.btn-default{ type: 'button', data: { dismiss: 'modal' } } Cancel
= f.submit 'Install license', class: 'gl-button btn btn-primary' = f.submit 'Install license', class: 'gl-button btn btn-confirm'
...@@ -56,4 +56,4 @@ ...@@ -56,4 +56,4 @@
= _('Unless otherwise agreed to in writing with GitLab, by clicking "Upload License" you agree that your use of GitLab Software is subject to the %{eula_link_start}Terms of Service%{eula_link_end}.').html_safe % { eula_link_start: eula_link_start, eula_url: eula_url, eula_link_end: '</a>'.html_safe } = _('Unless otherwise agreed to in writing with GitLab, by clicking "Upload License" you agree that your use of GitLab Software is subject to the %{eula_link_start}Terms of Service%{eula_link_end}.').html_safe % { eula_link_start: eula_link_start, eula_url: eula_url, eula_link_end: '</a>'.html_safe }
.form-actions .form-actions
= f.submit 'Upload License', class: 'gl-button btn btn-primary', disabled: true, id: 'js-upload-license' = f.submit 'Upload License', class: 'gl-button btn btn-confirm', disabled: true, id: 'js-upload-license'
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
.form-text.text-muted.js-scim-token-helper-text .form-text.text-muted.js-scim-token-helper-text
%span %span
= s_('GroupSAML|The SCIM token is now hidden. To see the value of the token again, you need to ') = s_('GroupSAML|The SCIM token is now hidden. To see the value of the token again, you need to ')
%button.btn.gl-button.btn-primary.btn-link.d-inline.align-baseline.js-reset-scim-token{ type: 'button' } %button.btn.gl-button.btn-confirm.btn-link.d-inline.align-baseline.js-reset-scim-token{ type: 'button' }
= _('reset it.') = _('reset it.')
%span.d-none %span.d-none
= s_("GroupSAML|Make sure you save this token — you won't be able to access it again.") = s_("GroupSAML|Make sure you save this token — you won't be able to access it again.")
......
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