diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-07-26 15:29:05 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-07-26 15:29:05 +0000 |
| commit | 4cebdbbe7f2a6308e093440018a4c40955ed1321 (patch) | |
| tree | ee76586b4034c2ae8a22c70414f3f64d540f1806 | |
| parent | 1f70de1806bedb0b80a3d13bdc38f8022f2fbc6a (diff) | |
| parent | bf73bb30c14d8b37d63d94555b9a2ea87a2efb1c (diff) | |
| download | gitlab-ce-4cebdbbe7f2a6308e093440018a4c40955ed1321.tar.gz | |
Merge branch '48636-new-mr-card-styles' into 'master'
Resolve "BS4: Create new Merge request boxes have different styles"
Closes #48636
See merge request gitlab-org/gitlab-ce!20822
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 2 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/creations/_new_compare.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/48636-new-mr-card-styles.yml | 5 |
3 files changed, 8 insertions, 1 deletions
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 |