Commit 24639ae0 authored by David O'Regan's avatar David O'Regan

Merge branch 'btn-confirm-admin-users' into 'master'

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

See merge request gitlab-org/gitlab!55276
parents 8b7da9b3 c4117b90
...@@ -87,8 +87,8 @@ ...@@ -87,8 +87,8 @@
.form-actions .form-actions
- if @user.new_record? - if @user.new_record?
= f.submit 'Create user', class: "btn gl-button btn-success" = f.submit 'Create user', class: "btn gl-button btn-confirm"
= link_to 'Cancel', admin_users_path, class: "gl-button btn btn-cancel" = link_to 'Cancel', admin_users_path, class: "gl-button btn btn-default btn-cancel"
- else - else
= f.submit 'Save changes', class: "btn gl-button btn-success" = f.submit 'Save changes', class: "btn gl-button btn-confirm"
= link_to 'Cancel', admin_user_path(@user), class: "btn gl-button btn-cancel" = link_to 'Cancel', admin_user_path(@user), class: "gl-button btn btn-default btn-cancel"
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
.nav-controls .nav-controls
= render_if_exists 'admin/users/admin_email_users' = render_if_exists 'admin/users/admin_email_users'
= render_if_exists 'admin/users/admin_export_user_permissions' = render_if_exists 'admin/users/admin_export_user_permissions'
= link_to s_('AdminUsers|New user'), new_admin_user_path, class: 'btn gl-button btn-success btn-search float-right' = link_to s_('AdminUsers|New user'), new_admin_user_path, class: 'btn gl-button btn-confirm btn-search float-right'
.filtered-search-block.row-content-block.border-top-0 .filtered-search-block.row-content-block.border-top-0
= form_tag admin_users_path, method: :get do = form_tag admin_users_path, method: :get do
......
---
title: Move to btn-confirm from btn-success in admin/users directory
merge_request: 55276
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