summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2018-08-08 15:56:21 -0500
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2018-08-08 15:57:33 -0500
commitc23961710bbbd2b361cd8e50f29063e568490dc6 (patch)
tree490cfc702e267649220b6c45aa3d102f4f551bb7
parent6f21652f0b79a614ad809dc028aaa28aee16732e (diff)
downloadgitlab-ce-c23961710bbbd2b361cd8e50f29063e568490dc6.tar.gz
Fix blocked user card styles
-rw-r--r--app/views/admin/users/show.html.haml4
-rw-r--r--changelogs/unreleased/50126-blocked-user-card.yml5
2 files changed, 7 insertions, 2 deletions
diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml
index f730fd05176..c7a3df9349a 100644
--- a/app/views/admin/users/show.html.haml
+++ b/app/views/admin/users/show.html.haml
@@ -138,8 +138,8 @@
%br
= link_to 'Confirm user', confirm_admin_user_path(@user), method: :put, class: "btn btn-info", data: { confirm: 'Are you sure?' }
- if @user.blocked?
- .card.bg-info
- .card-header
+ .card.border-info
+ .card-header.bg-info.text-white
This user is blocked
.card-body
%p A blocked user cannot:
diff --git a/changelogs/unreleased/50126-blocked-user-card.yml b/changelogs/unreleased/50126-blocked-user-card.yml
new file mode 100644
index 00000000000..b270bf7a757
--- /dev/null
+++ b/changelogs/unreleased/50126-blocked-user-card.yml
@@ -0,0 +1,5 @@
+---
+title: Fix blocked user card style
+merge_request:
+author:
+type: fixed