Adds a CE backport for 11226

https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/11226

Adds a CE backport for 11226
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/11226
b083b9b3 · Sam Beckham · Clement Ho · d9877120 · b083b9b3
Commit b083b9b3 authored May 20, 2019 by Sam Beckham Committed by Clement Ho May 20, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

app/assets/stylesheets/framework/modal.scss app/assets/stylesheets/framework/modal.scss +4 -2

No files found.
--- a/app/assets/stylesheets/framework/modal.scss
+++ b/app/assets/stylesheets/framework/modal.scss
@@ -53,7 +53,8 @@
  flex-direction: row;

  .btn + .btn:not(.dropdown-toggle-split),
-  .btn + .btn-group {
+  .btn + .btn-group,
+  .btn-group + .btn {
    margin-left: $grid-size;
  }

@@ -61,7 +62,8 @@
    flex-direction: column;

    .btn + .btn:not(.dropdown-toggle-split),
-    .btn + .btn-group {
+    .btn + .btn-group,
+    .btn-group + .btn {
      margin-left: 0;
      margin-top: $grid-size;
    }