Merge branch 'ee-50126-blocked-user-card' into 'master'

Add correct styling for .card

See merge request gitlab-org/gitlab-ee!6849

app/views/admin/users/show.html.haml

@@ -132,8 +132,8 @@
   .col-md-6
     - unless @user == current_user
       - unless @user.confirmed?
-        .card.bg-info
-          .card-header
+        .card.border-info
+          .card-header.bg-info.text-white
             Confirm user
           .card-body
             - if @user.unconfirmed_email.present?
@@ -143,14 +143,14 @@
             = link_to 'Confirm user', confirm_admin_user_path(@user), method: :put, class: "btn btn-info", data: { confirm: 'Are you sure?' }
       - if @user.note.present?
         - text = @user.note
-        .card.bg-info
-          .card-header
+        .card.border-info
+          .card-header.bg-info.text-white
             Admin Note
           .card-body
             %p= text
       - 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:
@@ -173,8 +173,8 @@
             %br
             = link_to 'Block user', block_admin_user_path(@user), data: { confirm: 'USER WILL BE BLOCKED! Are you sure?' }, method: :put, class: "btn btn-warning"
       - if @user.access_locked?
-        .card.bg-info
-          .card-header
+        .card.border-info
+          .card-header.bg-info.text-white
             This account has been locked
           .card-body
             %p This user has been temporarily locked due to excessive number of failed logins. You may manually unlock the account.

app/views/projects/pages/_use.html.haml

 - unless @project.pages_deployed?
-  .card.bg-info
-    .card-header
+  .card.border-info
+    .card-header.bg-info.text-white
       Configure pages
     .card-body
       %p

app/views/shared/milestones/_issuables.html.haml

@@ -2,8 +2,8 @@
 - primary = local_assigns.fetch(:primary, false)
 - panel_class = primary ? 'bg-primary text-white' : ''
 
-.card{ class: panel_class }
-  .card-header
+.card
+  .card-header{ class: panel_class }
     .title
       = title
     - if show_counter

app/views/shared/plugins/_index.html.haml

@@ -19,5 +19,5 @@
               .monospace
                 = File.basename(file)
     - else
-      %p.card.bg-light.text-center
-        No plugins found.
+      .card.bg-light.text-center
+        .nothing-here-block No plugins found.

changelogs/unreleased/50126-blocked-user-card.yml

+---
+title: Fix blocked user card style
+merge_request: 6849
+author:
+type: fixed