Commit 71e70964 authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Merge branch 'btn-confirm-admin-deploy-keys' into 'master'

Move to btn-confirm from btn-success in admin/deploy_keys directory

See merge request gitlab-org/gitlab!55267
parents fe3551eb ef127f97
...@@ -6,5 +6,5 @@ ...@@ -6,5 +6,5 @@
= form_for [:admin, @deploy_key], html: { class: 'deploy-key-form' } do |f| = form_for [:admin, @deploy_key], html: { class: 'deploy-key-form' } do |f|
= render partial: 'shared/deploy_keys/form', locals: { form: f, deploy_key: @deploy_key } = render partial: 'shared/deploy_keys/form', locals: { form: f, deploy_key: @deploy_key }
.form-actions .form-actions
= f.submit _('Save changes'), class: 'btn gl-button btn-success' = f.submit _('Save changes'), class: 'btn gl-button btn-confirm'
= link_to _('Cancel'), admin_deploy_keys_path, class: 'btn gl-button btn-cancel' = link_to _('Cancel'), admin_deploy_keys_path, class: 'btn gl-button btn-default btn-cancel'
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
- if @deploy_keys.any? - if @deploy_keys.any?
%h3.page-title.deploy-keys-title %h3.page-title.deploy-keys-title
= _('Public deploy keys (%{deploy_keys_count})') % { deploy_keys_count: @deploy_keys.load.size } = _('Public deploy keys (%{deploy_keys_count})') % { deploy_keys_count: @deploy_keys.load.size }
= link_to _('New deploy key'), new_admin_deploy_key_path, class: 'float-right btn gl-button btn-success btn-md gl-button' = link_to _('New deploy key'), new_admin_deploy_key_path, class: 'float-right btn gl-button btn-confirm btn-md gl-button'
.table-holder.deploy-keys-list .table-holder.deploy-keys-list
%table.table %table.table
%thead %thead
......
...@@ -6,5 +6,5 @@ ...@@ -6,5 +6,5 @@
= form_for [:admin, @deploy_key], html: { class: 'deploy-key-form' } do |f| = form_for [:admin, @deploy_key], html: { class: 'deploy-key-form' } do |f|
= render partial: 'shared/deploy_keys/form', locals: { form: f, deploy_key: @deploy_key } = render partial: 'shared/deploy_keys/form', locals: { form: f, deploy_key: @deploy_key }
.form-actions .form-actions
= f.submit 'Create', class: 'btn gl-button btn-success' = f.submit 'Create', class: 'btn gl-button btn-confirm'
= link_to 'Cancel', admin_deploy_keys_path, class: 'btn gl-button btn-cancel' = link_to 'Cancel', admin_deploy_keys_path, class: 'btn gl-button btn-default btn-cancel'
---
title: Move to btn-confirm from btn-success in admin/deploy_keys directory
merge_request: 55267
author: Yogi (@yo)
type: changed
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