From bf73bb30c14d8b37d63d94555b9a2ea87a2efb1c Mon Sep 17 00:00:00 2001
From: Annabel Gray <annabel.m.gray@gmail.com>
Date: Thu, 26 Jul 2018 15:29:05 +0000
Subject: [PATCH] Resolve "BS4: Create new Merge request boxes have different
 styles"

---
 app/assets/stylesheets/framework/variables.scss              | 2 ++
 .../projects/merge_requests/creations/_new_compare.html.haml | 2 +-
 changelogs/unreleased/48636-new-mr-card-styles.yml           | 5 +++++
 3 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/unreleased/48636-new-mr-card-styles.yml

diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index efc54196b75..08755b4b545 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -835,3 +835,5 @@ $font-family-monospace: $monospace-font;
 $input-line-height: 20px;
 $btn-line-height: 20px;
 $table-accent-bg: $gray-light;
+$card-border-color: $border-color;
+$card-cap-bg: $gray-light;
diff --git a/app/views/projects/merge_requests/creations/_new_compare.html.haml b/app/views/projects/merge_requests/creations/_new_compare.html.haml
index ca0f7d6098f..afa7eb06cb4 100644
--- a/app/views/projects/merge_requests/creations/_new_compare.html.haml
+++ b/app/views/projects/merge_requests/creations/_new_compare.html.haml
@@ -27,7 +27,7 @@
               = dropdown_filter(_("Search branches"))
               = dropdown_content
               = dropdown_loading
-        .panel-footer
+        .card-footer
           .text-center= icon('spinner spin', class: 'js-source-loading')
           %ul.list-unstyled.mr_source_commit
 
diff --git a/changelogs/unreleased/48636-new-mr-card-styles.yml b/changelogs/unreleased/48636-new-mr-card-styles.yml
new file mode 100644
index 00000000000..94f62e677fb
--- /dev/null
+++ b/changelogs/unreleased/48636-new-mr-card-styles.yml
@@ -0,0 +1,5 @@
+---
+title: Fix new MR card styles
+merge_request: 20822
+author:
+type: fixed