Commit 761f71de authored by Martin Wortschack's avatar Martin Wortschack

Merge branch 'feature/hooks_gitlab_button_style' into 'master'

Apply GitLab UI button styles to buttons in app/views/admin/hooks directory

See merge request gitlab-org/gitlab!42735
parents 42b52efa 4024fab4
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
= form_for @hook, as: :hook, url: admin_hook_path do |f| = form_for @hook, as: :hook, url: admin_hook_path do |f|
= render partial: 'form', locals: { form: f, hook: @hook } = render partial: 'form', locals: { form: f, hook: @hook }
.form-actions .form-actions
%span>= f.submit _('Save changes'), class: 'btn btn-success gl-mr-3' %span>= f.submit _('Save changes'), class: 'btn gl-button btn-success gl-mr-3'
= render 'shared/web_hooks/test_button', hook: @hook = render 'shared/web_hooks/test_button', hook: @hook
= link_to _('Delete'), admin_hook_path(@hook), method: :delete, class: 'btn btn-remove float-right', data: { confirm: _('Are you sure?') } = link_to _('Delete'), admin_hook_path(@hook), method: :delete, class: 'btn gl-button btn-remove float-right', data: { confirm: _('Are you sure?') }
%hr %hr
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
.col-lg-8.gl-mb-3 .col-lg-8.gl-mb-3
= form_for @hook, as: :hook, url: admin_hooks_path do |f| = form_for @hook, as: :hook, url: admin_hooks_path do |f|
= render partial: 'form', locals: { form: f, hook: @hook } = render partial: 'form', locals: { form: f, hook: @hook }
= f.submit _('Add system hook'), class: 'btn btn-success' = f.submit _('Add system hook'), class: 'btn gl-button btn-success'
= render 'shared/web_hooks/index', hooks: @hooks, hook_class: @hook.class = render 'shared/web_hooks/index', hooks: @hooks, hook_class: @hook.class
......
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