Automatic merge of gitlab-org/gitlab-ce master

6c2c7b66 · GitLab Bot · e27fe6fc · b929fc03 · 6c2c7b66
Commit 6c2c7b66 authored Jul 10, 2019 by GitLab Bot
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

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

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

+  .btn {
+    margin: 0;
+  }
+
  .btn + .btn:not(.dropdown-toggle-split),
  .btn + .btn-group,
  .btn-group + .btn {