Commit 936f2916 authored by Denys Mishunov's avatar Denys Mishunov

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

Upgrades buttons in app/views/[stuvwxyz]

See merge request gitlab-org/gitlab!45001
parents 99314b5e c004a439
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
- unless params[:snippets].eql? 'true' - unless params[:snippets].eql? 'true'
= render 'filter' = render 'filter'
.d-flex-center.flex-column.flex-lg-row .d-flex-center.flex-column.flex-lg-row
= button_tag _("Search"), class: "btn btn-success btn-search form-control mt-lg-0 ml-lg-1 align-self-end" = button_tag _("Search"), class: "gl-button btn btn-success btn-search form-control mt-lg-0 ml-lg-1 align-self-end"
...@@ -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: 'btn btn-primary gl-mr-3' class: 'gl-button btn btn-primary gl-mr-3'
= link_to _('Cancel'), new_user_session_path, class: 'btn gl-mr-3' = link_to _('Cancel'), new_user_session_path, class: 'gl-button btn gl-mr-3'
...@@ -21,4 +21,4 @@ ...@@ -21,4 +21,4 @@
%td %td
= link_to(t('sherlock.view'), = link_to(t('sherlock.view'),
sherlock_transaction_file_sample_path(@transaction, sample), sherlock_transaction_file_sample_path(@transaction, sample),
class: 'btn btn-sm') class: 'gl-button btn btn-sm')
...@@ -21,4 +21,4 @@ ...@@ -21,4 +21,4 @@
%td %td
= link_to(t('sherlock.view'), = link_to(t('sherlock.view'),
sherlock_transaction_query_path(@transaction, query), sherlock_transaction_query_path(@transaction, query),
class: 'btn btn-sm') class: 'gl-button btn btn-sm')
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
.row-content-block .row-content-block
.float-right .float-right
= link_to(destroy_all_sherlock_transactions_path, = link_to(destroy_all_sherlock_transactions_path,
class: 'btn btn-danger', class: 'gl-button btn btn-danger',
method: :delete) do method: :delete) do
= sprite_icon('remove') = sprite_icon('remove')
= t('sherlock.delete_all_transactions') = t('sherlock.delete_all_transactions')
...@@ -37,5 +37,5 @@ ...@@ -37,5 +37,5 @@
%td %td
= time_ago_with_tooltip trans.finished_at = time_ago_with_tooltip trans.finished_at
%td %td
= link_to(sherlock_transaction_path(trans), class: 'btn btn-sm') do = link_to(sherlock_transaction_path(trans), class: 'gl-button btn btn-sm') do
= t('sherlock.view') = t('sherlock.view')
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
- if note_editable - if note_editable
.note-actions-item .note-actions-item
= button_tag title: _('Edit comment'), class: 'note-action-button js-note-edit has-tooltip btn btn-transparent', data: { container: 'body', qa_selector: 'edit_comment_button' } do = button_tag title: _('Edit comment'), class: 'note-action-button js-note-edit has-tooltip gl-button btn btn-transparent', data: { container: 'body', qa_selector: 'edit_comment_button' } do
%span.link-highlight %span.link-highlight
= custom_icon('icon_pencil') = custom_icon('icon_pencil')
......
...@@ -6,13 +6,13 @@ ...@@ -6,13 +6,13 @@
.card-footer.footer-block.clearfix .card-footer.footer-block.clearfix
- if can?(current_user, :accept_terms, @term) - if can?(current_user, :accept_terms, @term)
.float-right .float-right
= button_to accept_term_path(@term, redirect_params), class: 'btn btn-success gl-ml-3', data: { qa_selector: 'accept_terms_button' } do = button_to accept_term_path(@term, redirect_params), class: 'gl-button btn btn-success gl-ml-3', data: { qa_selector: 'accept_terms_button' } do
= _('Accept terms') = _('Accept terms')
- else - else
.float-right .float-right
= link_to root_path, class: 'btn btn-success gl-ml-3' do = link_to root_path, class: 'gl-button btn btn-success gl-ml-3' do
= _('Continue') = _('Continue')
- if can?(current_user, :decline_terms, @term) - if can?(current_user, :decline_terms, @term)
.float-right .float-right
= button_to decline_term_path(@term, redirect_params), class: 'btn btn-default gl-ml-3' do = button_to decline_term_path(@term, redirect_params), class: 'gl-button btn btn-default gl-ml-3' do
= _('Decline and sign out') = _('Decline and sign out')
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