Commit f3203cbb authored by Clement Ho's avatar Clement Ho

Merge branch 'winh-admin-user-actions-dropdown' into 'master'

Make admin user actions dropdown consistent

See merge request !13630
parents 10575998 0780fba3
...@@ -743,6 +743,11 @@ ...@@ -743,6 +743,11 @@
border-radius: 0; border-radius: 0;
padding: 8px 16px; padding: 8px 16px;
// make sure the text color is not overriden
&.text-danger {
@extend .text-danger;
}
&.is-focused, &.is-focused,
&:hover, &:hover,
&:active, &:active,
......
...@@ -132,6 +132,8 @@ ul.content-list { ...@@ -132,6 +132,8 @@ ul.content-list {
} }
.controls { .controls {
@include new-style-dropdown;
float: right; float: right;
> .control-text { > .control-text {
......
...@@ -40,9 +40,10 @@ ...@@ -40,9 +40,10 @@
%li %li
= link_to 'Remove user', admin_user_path(user), = link_to 'Remove user', admin_user_path(user),
data: { confirm: "USER #{user.name} WILL BE REMOVED! Are you sure?" }, data: { confirm: "USER #{user.name} WILL BE REMOVED! Are you sure?" },
class: 'text-danger',
method: :delete method: :delete
%li %li
= link_to 'Remove user and contributions', admin_user_path(user, hard_delete: true), = link_to 'Remove user and contributions', admin_user_path(user, hard_delete: true),
data: { confirm: "USER #{user.name} WILL BE REMOVED! All issues, merge requests and comments authored by this user, and groups owned solely by them, will also be removed! Are you sure?" }, data: { confirm: "USER #{user.name} WILL BE REMOVED! All issues, merge requests and comments authored by this user, and groups owned solely by them, will also be removed! Are you sure?" },
class: 'btn btn-remove btn-block', class: 'text-danger',
method: :delete method: :delete
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