Commit bc0546a1 authored by Denys Mishunov's avatar Denys Mishunov

Merge branch 'regex-button-update-cdef' into 'master'

Upgrades buttons in app/views/[cdef]

See merge request gitlab-org/gitlab!44993
parents 4a7f36ee 67f0f020
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
= clipboard_button(target: '#registration_token', title: _("Copy token"), class: "btn-transparent btn-clipboard") = clipboard_button(target: '#registration_token', title: _("Copy token"), class: "btn-transparent btn-clipboard")
.gl-mt-3.gl-mb-3 .gl-mt-3.gl-mb-3
= button_to _("Reset runners registration token"), reset_token_url, = button_to _("Reset runners registration token"), reset_token_url,
method: :put, class: 'btn btn-default', method: :put, class: 'gl-button btn btn-default',
data: { confirm: _("Are you sure you want to reset registration token?") } data: { confirm: _("Are you sure you want to reset registration token?") }
%li %li
= _("Start the Runner!") = _("Start the Runner!")
...@@ -19,4 +19,4 @@ ...@@ -19,4 +19,4 @@
= link_to _('Install Runner on Kubernetes'), = link_to _('Install Runner on Kubernetes'),
clusters_path, clusters_path,
class: 'btn btn-info' class: 'gl-button btn btn-info'
...@@ -11,4 +11,4 @@ ...@@ -11,4 +11,4 @@
- if clusterable.can_add_cluster? - if clusterable.can_add_cluster?
.gl-text-center .gl-text-center
= link_to s_('ClusterIntegration|Integrate with a cluster certificate'), clusterable.new_path, class: 'btn btn-success' = link_to s_('ClusterIntegration|Integrate with a cluster certificate'), clusterable.new_path, class: 'gl-button btn btn-success'
...@@ -55,4 +55,4 @@ ...@@ -55,4 +55,4 @@
= render('clusters/clusters/namespace', platform_field: platform_field, field: field) = render('clusters/clusters/namespace', platform_field: platform_field, field: field)
.form-group .form-group
= field.submit s_('ClusterIntegration|Save changes'), class: 'btn btn-success' = field.submit s_('ClusterIntegration|Save changes'), class: 'gl-button btn btn-success'
...@@ -86,4 +86,4 @@ ...@@ -86,4 +86,4 @@
.form-group.js-gke-cluster-creation-submit-container .form-group.js-gke-cluster-creation-submit-container
= field.submit s_('ClusterIntegration|Create Kubernetes cluster'), = field.submit s_('ClusterIntegration|Create Kubernetes cluster'),
class: 'js-gke-cluster-creation-submit btn btn-success', disabled: true class: 'js-gke-cluster-creation-submit gl-button btn btn-success', disabled: true
...@@ -60,4 +60,4 @@ ...@@ -60,4 +60,4 @@
= render('clusters/clusters/namespace', platform_field: platform_kubernetes_field) = render('clusters/clusters/namespace', platform_field: platform_kubernetes_field)
.form-group .form-group
= field.submit s_('ClusterIntegration|Add Kubernetes cluster'), class: 'btn btn-success', data: { qa_selector: 'add_kubernetes_cluster_button' } = field.submit s_('ClusterIntegration|Add Kubernetes cluster'), class: 'gl-button btn btn-success', data: { qa_selector: 'add_kubernetes_cluster_button' }
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
- if current_user.can_create_group? - if current_user.can_create_group?
.page-title-controls .page-title-controls
= link_to _("New group"), new_group_path, class: "btn btn-success" = link_to _("New group"), new_group_path, class: "gl-button btn btn-success"
.top-area .top-area
%ul.nav-links.mobile-separator.nav.nav-tabs %ul.nav-links.mobile-separator.nav.nav-tabs
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
- if current_user.can_create_project? - if current_user.can_create_project?
.page-title-controls .page-title-controls
= link_to _("New project"), new_project_path, class: "btn btn-success" = link_to _("New project"), new_project_path, class: "gl-button btn btn-success"
.top-area.scrolling-tabs-container.inner-page-scroll-tabs .top-area.scrolling-tabs-container.inner-page-scroll-tabs
.fade-left= sprite_icon('chevron-lg-left', size: 12) .fade-left= sprite_icon('chevron-lg-left', size: 12)
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
- if current_user && current_user.snippets.any? || @snippets.any? - if current_user && current_user.snippets.any? || @snippets.any?
.page-title-controls .page-title-controls
- if can?(current_user, :create_snippet) - if can?(current_user, :create_snippet)
= link_to _("New snippet"), new_snippet_path, class: "btn btn-success", title: _("New snippet") = link_to _("New snippet"), new_snippet_path, class: "gl-button btn btn-success", title: _("New snippet")
.top-area .top-area
%ul.nav-links.nav.nav-tabs %ul.nav-links.nav.nav-tabs
......
...@@ -48,14 +48,14 @@ ...@@ -48,14 +48,14 @@
- if todo.pending? - if todo.pending?
.todo-actions .todo-actions
= link_to dashboard_todo_path(todo), method: :delete, class: 'btn btn-loading d-flex align-items-center js-done-todo', data: { href: dashboard_todo_path(todo) } do = link_to dashboard_todo_path(todo), method: :delete, class: 'gl-button btn btn-loading d-flex align-items-center js-done-todo', data: { href: dashboard_todo_path(todo) } do
Done Done
%span.spinner.ml-1 %span.spinner.ml-1
= link_to restore_dashboard_todo_path(todo), method: :patch, class: 'btn btn-loading d-flex align-items-center js-undo-todo hidden', data: { href: restore_dashboard_todo_path(todo) } do = link_to restore_dashboard_todo_path(todo), method: :patch, class: 'gl-button btn btn-loading d-flex align-items-center js-undo-todo hidden', data: { href: restore_dashboard_todo_path(todo) } do
Undo Undo
%span.spinner.ml-1 %span.spinner.ml-1
- else - else
.todo-actions .todo-actions
= link_to restore_dashboard_todo_path(todo), method: :patch, class: 'btn btn-loading d-flex align-items-center js-add-todo', data: { href: restore_dashboard_todo_path(todo) } do = link_to restore_dashboard_todo_path(todo), method: :patch, class: 'gl-button btn btn-loading d-flex align-items-center js-add-todo', data: { href: restore_dashboard_todo_path(todo) } do
Add a to do Add a to do
%span.spinner.ml-1 %span.spinner.ml-1
...@@ -27,10 +27,10 @@ ...@@ -27,10 +27,10 @@
.nav-controls .nav-controls
- if @todos.any?(&:pending?) - if @todos.any?(&:pending?)
.gl-mr-3 .gl-mr-3
= link_to destroy_all_dashboard_todos_path(todos_filter_params), class: 'btn btn-loading align-items-center js-todos-mark-all', method: :delete, data: { href: destroy_all_dashboard_todos_path(todos_filter_params) } do = link_to destroy_all_dashboard_todos_path(todos_filter_params), class: 'gl-button btn btn-loading align-items-center js-todos-mark-all', method: :delete, data: { href: destroy_all_dashboard_todos_path(todos_filter_params) } do
Mark all as done Mark all as done
%span.spinner.ml-1 %span.spinner.ml-1
= link_to bulk_restore_dashboard_todos_path, class: 'btn btn-loading align-items-center js-todos-undo-all hidden', method: :patch , data: { href: bulk_restore_dashboard_todos_path(todos_filter_params) } do = link_to bulk_restore_dashboard_todos_path, class: 'gl-button btn btn-loading align-items-center js-todos-undo-all hidden', method: :patch , data: { href: bulk_restore_dashboard_todos_path(todos_filter_params) } do
Undo mark all as done Undo mark all as done
%span.spinner.ml-1 %span.spinner.ml-1
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
= f.label :email = f.label :email
= f.email_field :email, class: "form-control", required: true, title: 'Please provide a valid email address.' = f.email_field :email, class: "form-control", required: true, title: 'Please provide a valid email address.'
.clearfix .clearfix
= f.submit "Resend", class: 'btn btn-success' = f.submit "Resend", class: 'gl-button btn btn-success'
.clearfix.prepend-top-20 .clearfix.prepend-top-20
= render 'devise/shared/sign_in_link' = render 'devise/shared/sign_in_link'
...@@ -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 bottom", title: 'This field is required', data: { qa_selector: 'password_confirmation_field' }, required: true = f.password_field :password_confirmation, class: "form-control bottom", title: 'This field is required', data: { qa_selector: 'password_confirmation_field' }, required: true
.clearfix .clearfix
= f.submit "Change your password", class: "btn btn-primary", data: { qa_selector: 'change_password_button' } = f.submit "Change your password", class: "gl-button btn btn-primary", data: { qa_selector: 'change_password_button' }
.clearfix.prepend-top-20 .clearfix.prepend-top-20
%p %p
......
...@@ -20,4 +20,4 @@ ...@@ -20,4 +20,4 @@
= recaptcha_tags = recaptcha_tags
.submit-container.move-submit-down .submit-container.move-submit-down
= f.submit _('Sign in'), class: 'btn btn-success', data: { qa_selector: 'sign_in_button' } = f.submit _('Sign in'), class: 'gl-button btn btn-success', data: { qa_selector: 'sign_in_button' }
...@@ -11,6 +11,6 @@ ...@@ -11,6 +11,6 @@
= f.text_field :otp_attempt, class: 'form-control', required: true, autofocus: true, autocomplete: 'off', title: 'This field is required.', data: { qa_selector: 'two_fa_code_field' } = f.text_field :otp_attempt, class: 'form-control', required: true, autofocus: true, autocomplete: 'off', title: 'This field is required.', data: { qa_selector: 'two_fa_code_field' }
%p.form-text.text-muted.hint Enter the code from the two-factor app on your mobile device. If you've lost your device, you may enter one of your recovery codes. %p.form-text.text-muted.hint Enter the code from the two-factor app on your mobile device. If you've lost your device, you may enter one of your recovery codes.
.prepend-top-20 .prepend-top-20
= f.submit "Verify code", class: "btn btn-success", data: { qa_selector: 'verify_code_button' } = f.submit "Verify code", class: "gl-button btn btn-success", data: { qa_selector: 'verify_code_button' }
- if @user.two_factor_webauthn_u2f_enabled? - if @user.two_factor_webauthn_u2f_enabled?
= render "authentication/authenticate", params: params, resource: resource, resource_name: resource_name, render_remember_me: true, target_path: new_user_session_path = render "authentication/authenticate", params: params, resource: resource, resource_name: resource_name, render_remember_me: true, target_path: new_user_session_path
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
- if show_recaptcha_sign_up? - if show_recaptcha_sign_up?
= recaptcha_tags = recaptcha_tags
.submit-container.mt-3 .submit-container.mt-3
= f.submit _("Register"), class: "btn-register btn btn-block btn-success mb-0 p-2", data: { qa_selector: 'new_user_register_button' } = f.submit _("Register"), class: "btn-register gl-button btn btn-block btn-success mb-0 p-2", data: { qa_selector: 'new_user_register_button' }
= render 'devise/shared/terms_of_service_notice' = render 'devise/shared/terms_of_service_notice'
- if omniauth_enabled? && button_based_providers_enabled? - if omniauth_enabled? && button_based_providers_enabled?
= render 'devise/shared/experimental_separate_sign_up_flow_omniauth_box' = render 'devise/shared/experimental_separate_sign_up_flow_omniauth_box'
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
.d-flex.justify-content-between.flex-wrap .d-flex.justify-content-between.flex-wrap
- providers.each do |provider| - providers.each do |provider|
- has_icon = provider_has_icon?(provider) - has_icon = provider_has_icon?(provider)
= link_to omniauth_authorize_path(:user, provider), method: :post, class: "btn d-flex align-items-center omniauth-btn text-left oauth-login mb-2 p-2 #{qa_class_for_provider(provider)}", id: "oauth-login-#{provider}" do = link_to omniauth_authorize_path(:user, provider), method: :post, class: "gl-button btn d-flex align-items-center omniauth-btn text-left oauth-login mb-2 p-2 #{qa_class_for_provider(provider)}", id: "oauth-login-#{provider}" do
- if has_icon - if has_icon
= provider_image_tag(provider) = provider_image_tag(provider)
%span.ml-2 %span.ml-2
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
.d-flex.justify-content-between.flex-wrap .d-flex.justify-content-between.flex-wrap
- providers.each do |provider| - providers.each do |provider|
- has_icon = provider_has_icon?(provider) - has_icon = provider_has_icon?(provider)
= button_to omniauth_authorize_path(:user, provider), id: "oauth-login-#{provider}", class: "btn d-flex align-items-center omniauth-btn text-left oauth-login #{qa_class_for_provider(provider)}" do = button_to omniauth_authorize_path(:user, provider), id: "oauth-login-#{provider}", class: "gl-button btn d-flex align-items-center omniauth-btn text-left oauth-login #{qa_class_for_provider(provider)}" do
- if has_icon - if has_icon
= provider_image_tag(provider) = provider_image_tag(provider)
%span %span
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
= f.label :email = f.label :email
= f.email_field :email, class: 'form-control', autofocus: 'autofocus', autocapitalize: 'off', autocorrect: 'off', title: 'Please provide a valid email address.' = f.email_field :email, class: 'form-control', autofocus: 'autofocus', autocapitalize: 'off', autocorrect: 'off', title: 'Please provide a valid email address.'
.clearfix .clearfix
= f.submit 'Resend unlock instructions', class: 'btn btn-success' = f.submit 'Resend unlock instructions', class: 'gl-button btn btn-success'
.clearfix.prepend-top-20 .clearfix.prepend-top-20
= render 'devise/shared/sign_in_link' = render 'devise/shared/sign_in_link'
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
= form_tag oauth_application_path(application) do = form_tag oauth_application_path(application) do
%input{ :name => "_method", :type => "hidden", :value => "delete" }/ %input{ :name => "_method", :type => "hidden", :value => "delete" }/
- if defined? small - if defined? small
= button_tag type: "submit", class: "btn btn-transparent", data: { confirm: _("Are you sure?") } do = button_tag type: "submit", class: "gl-button btn btn-transparent", data: { confirm: _("Are you sure?") } do
%span.sr-only %span.sr-only
= _('Destroy') = _('Destroy')
= sprite_icon('remove') = sprite_icon('remove')
......
...@@ -23,4 +23,4 @@ ...@@ -23,4 +23,4 @@
= render 'shared/tokens/scopes_form', prefix: 'doorkeeper_application', token: application, scopes: @scopes = render 'shared/tokens/scopes_form', prefix: 'doorkeeper_application', token: application, scopes: @scopes
.gl-mt-3 .gl-mt-3
= f.submit _('Save application'), class: "btn btn-success" = f.submit _('Save application'), class: "gl-button btn btn-success"
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
%div= uri %div= uri
%td= application.access_tokens.count %td= application.access_tokens.count
%td %td
= link_to edit_oauth_application_path(application), class: "btn btn-transparent gl-mr-2" do = link_to edit_oauth_application_path(application), class: "gl-button btn btn-transparent gl-mr-2" do
%span.sr-only %span.sr-only
= _('Edit') = _('Edit')
= sprite_icon('pencil') = sprite_icon('pencil')
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
.input-group .input-group
%input.label.label-monospace.monospace{ id: "application_id", type: "text", autocomplete: 'off', value: @application.uid, readonly: true } %input.label.label-monospace.monospace{ id: "application_id", type: "text", autocomplete: 'off', value: @application.uid, readonly: true }
.input-group-append .input-group-append
= clipboard_button(target: '#application_id', title: _("Copy ID"), class: "btn btn btn-default") = clipboard_button(target: '#application_id', title: _("Copy ID"), class: "gl-button btn btn-default")
%tr %tr
%td %td
= _('Secret') = _('Secret')
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
.input-group .input-group
%input.label.label-monospace.monospace{ id: "secret", type: "text", autocomplete: 'off', value: @application.secret, readonly: true } %input.label.label-monospace.monospace{ id: "secret", type: "text", autocomplete: 'off', value: @application.secret, readonly: true }
.input-group-append .input-group-append
= clipboard_button(target: '#secret', title: _("Copy secret"), class: "btn btn btn-default") = clipboard_button(target: '#secret', title: _("Copy secret"), class: "gl-button btn btn-default")
%tr %tr
%td %td
= _('Callback URL') = _('Callback URL')
...@@ -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: 'btn btn-primary wide float-left' = link_to _('Edit'), edit_oauth_application_path(@application), class: 'gl-button btn btn-primary 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: 'btn btn-danger gl-ml-3'
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
= hidden_field_tag :response_type, @pre_auth.response_type = hidden_field_tag :response_type, @pre_auth.response_type
= hidden_field_tag :scope, @pre_auth.scope = hidden_field_tag :scope, @pre_auth.scope
= hidden_field_tag :nonce, @pre_auth.nonce = hidden_field_tag :nonce, @pre_auth.nonce
= submit_tag _("Deny"), class: "btn btn-danger" = submit_tag _("Deny"), class: "gl-button btn btn-danger"
= form_tag oauth_authorization_path, method: :post, class: 'inline' do = form_tag oauth_authorization_path, method: :post, class: 'inline' do
= hidden_field_tag :client_id, @pre_auth.client.uid = hidden_field_tag :client_id, @pre_auth.client.uid
= hidden_field_tag :redirect_uri, @pre_auth.redirect_uri = hidden_field_tag :redirect_uri, @pre_auth.redirect_uri
...@@ -46,4 +46,4 @@ ...@@ -46,4 +46,4 @@
= hidden_field_tag :response_type, @pre_auth.response_type = hidden_field_tag :response_type, @pre_auth.response_type
= hidden_field_tag :scope, @pre_auth.scope = hidden_field_tag :scope, @pre_auth.scope
= hidden_field_tag :nonce, @pre_auth.nonce = hidden_field_tag :nonce, @pre_auth.nonce
= submit_tag _("Authorize"), class: "btn btn-success gl-ml-3", data: { qa_selector: 'authorization_button' } = submit_tag _("Authorize"), class: "gl-button btn btn-success gl-ml-3", data: { qa_selector: 'authorization_button' }
...@@ -11,6 +11,6 @@ ...@@ -11,6 +11,6 @@
%p %p
= s_('403|Please contact your GitLab administrator to get permission.') = s_('403|Please contact your GitLab administrator to get permission.')
.action-container.js-go-back{ hidden: true } .action-container.js-go-back{ hidden: true }
%button{ type: 'button', class: 'btn btn-success' } %button{ type: 'button', class: 'gl-button btn btn-success' }
= s_('Go Back') = s_('Go Back')
= render "errors/footer" = render "errors/footer"
...@@ -11,5 +11,5 @@ ...@@ -11,5 +11,5 @@
= form_tag search_path, method: :get, class: 'form-inline-flex' do |f| = form_tag search_path, method: :get, class: 'form-inline-flex' do |f|
.field .field
= search_field_tag :search, '', placeholder: _('Search for projects, issues, etc.'), class: 'form-control' = search_field_tag :search, '', placeholder: _('Search for projects, issues, etc.'), class: 'form-control'
= button_tag _('Search'), class: 'btn btn-sm btn-success', name: nil, type: 'submit' = button_tag _('Search'), class: 'gl-button btn btn-sm btn-success', name: nil, type: 'submit'
= render 'errors/footer' = render 'errors/footer'
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
%p Try logging in using your username or email. If you have forgotten your password, try recovering it %p Try logging in using your username or email. If you have forgotten your password, try recovering it
= link_to "Sign in", new_session_path(:user), class: 'btn primary' = link_to "Sign in", new_session_path(:user), class: 'gl-button btn primary'
= link_to "Recover password", new_password_path(:user), class: 'btn secondary' = link_to "Recover password", new_password_path(:user), class: 'gl-button btn secondary'
%hr %hr
%p.light If none of the options work, try contacting a GitLab administrator. %p.light If none of the options work, try contacting a GitLab administrator.
...@@ -18,4 +18,4 @@ ...@@ -18,4 +18,4 @@
%h5= _("Maximum page reached") %h5= _("Maximum page reached")
%p= _("Sorry, you have exceeded the maximum browsable page number. Please use the API to explore further.") %p= _("Sorry, you have exceeded the maximum browsable page number. Please use the API to explore further.")
= link_to _("Back to page %{number}") % { number: @max_page_number }, request.params.merge(page: @max_page_number), class: 'btn btn-inverted' = link_to _("Back to page %{number}") % { number: @max_page_number }, request.params.merge(page: @max_page_number), class: 'gl-button btn btn-inverted'
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