Merge branch 'update-card-body-style' into 'master'

Remove background color from card-body style

Closes #49350

See merge request gitlab-org/gitlab-ce!20689

app/assets/stylesheets/framework/panels.scss

@@ -47,7 +47,6 @@
 
 .card-body {
   padding: $gl-padding;
-  background-color: $white-light;
 
   .form-actions {
     margin: -$gl-padding;

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

@@ -149,8 +149,8 @@
             %br
             = link_to 'Unblock user', unblock_admin_user_path(@user), method: :put, class: "btn btn-info", data: { confirm: 'Are you sure?' }
       - else
-        .card.bg-warning
-          .card-header
+        .card.border-warning
+          .card-header.bg-warning.text-white
             Block this user
           .card-body
             %p Blocking user has the following effects:
@@ -170,8 +170,8 @@
             %br
             = link_to 'Unlock user', unlock_admin_user_path(@user), method: :put, class: "btn btn-info", data: { confirm: 'Are you sure?' }
 
-      .card.bg-danger
-        .card-header
+      .card.border-danger
+        .card-header.bg-danger.text-white
           = s_('AdminUsers|Delete user')
         .card-body
           - if @user.can_be_removed? && can?(current_user, :destroy_user, @user)
@@ -196,8 +196,8 @@
               %p
                 You don't have access to delete this user.
 
-      .card.bg-danger
-        .card-header
+      .card.border-danger
+        .card-header.bg-danger.text-white
           = s_('AdminUsers|Delete user and contributions')
         .card-body
           - if can?(current_user, :destroy_user, @user)

app/views/projects/imports/new.html.haml

@@ -5,8 +5,8 @@
 %hr
 
 - if @project.import_failed?
-  .card.bg-danger
-    .card-header The repository could not be imported.
+  .card.border-danger
+    .card-header.bg-danger.text-white The repository could not be imported.
     .card-body
       %pre
         :preserve

app/views/projects/pages/_destroy.haml

 - if @project.pages_deployed?
   - if can?(current_user, :remove_pages, @project)
-    .card.bg-danger
-      .card-header Remove pages
+    .card.border-danger
+      .card-header.bg-danger.text-white Remove pages
       .errors-holder
       .card-body
         %p

changelogs/unreleased/update-card-body-style.yml

+---
+title: Remove background color from card-body style
+merge_request: 20689
+author: George Tsiolis
+type: fixed