summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwinh <winnie@gitlab.com>2017-08-17 12:20:55 +0200
committerwinh <winnie@gitlab.com>2017-08-17 13:57:41 +0200
commit0780fba337749d8cb1239e997d8d1c2a84349234 (patch)
tree5e6d535541573fcab504022ecd9e77d726b5dc7c
parentec34b2d051c16a351387fbaedb5542654810b8a5 (diff)
downloadgitlab-ce-0780fba337749d8cb1239e997d8d1c2a84349234.tar.gz
Make admin user actions dropdown consistentwinh-admin-user-actions-dropdown
-rw-r--r--app/assets/stylesheets/framework/dropdowns.scss5
-rw-r--r--app/assets/stylesheets/framework/lists.scss2
-rw-r--r--app/views/admin/users/_user.html.haml3
3 files changed, 9 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index 1bb04b59a2a..958159b507a 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -743,6 +743,11 @@
border-radius: 0;
padding: 8px 16px;
+ // make sure the text color is not overriden
+ &.text-danger {
+ @extend .text-danger;
+ }
+
&.is-focused,
&:hover,
&:active,
diff --git a/app/assets/stylesheets/framework/lists.scss b/app/assets/stylesheets/framework/lists.scss
index ab754f4a492..df2bf561194 100644
--- a/app/assets/stylesheets/framework/lists.scss
+++ b/app/assets/stylesheets/framework/lists.scss
@@ -132,6 +132,8 @@ ul.content-list {
}
.controls {
+ @include new-style-dropdown;
+
float: right;
> .control-text {
diff --git a/app/views/admin/users/_user.html.haml b/app/views/admin/users/_user.html.haml
index 4cf4a57ba18..ca6e43e091c 100644
--- a/app/views/admin/users/_user.html.haml
+++ b/app/views/admin/users/_user.html.haml
@@ -40,9 +40,10 @@
%li
= link_to 'Remove user', admin_user_path(user),
data: { confirm: "USER #{user.name} WILL BE REMOVED! Are you sure?" },
+ class: 'text-danger',
method: :delete
%li
= 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?" },
- class: 'btn btn-remove btn-block',
+ class: 'text-danger',
method: :delete