summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsamdbeckham <sbeckham@gitlab.com>2019-06-10 13:31:16 +0100
committersamdbeckham <sbeckham@gitlab.com>2019-07-11 14:59:30 +0100
commit45a1c998a6971333ad6a3c5f2cac425c4f04e5f7 (patch)
treead7f7507081023e59ad0041dc4366d8c520d2b93
parent04bcbaa5e1c02cda6606ad48cb4fecf40e93225c (diff)
downloadgitlab-ce-10364-dismissal-reason-any-comment-CE.tar.gz
CE backport for Dismissal Reasons10364-dismissal-reason-any-comment-CE
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/12067
-rw-r--r--app/assets/stylesheets/framework/modal.scss9
1 files changed, 9 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/modal.scss b/app/assets/stylesheets/framework/modal.scss
index b721b90fbb3..3633b5a9b9a 100644
--- a/app/assets/stylesheets/framework/modal.scss
+++ b/app/assets/stylesheets/framework/modal.scss
@@ -63,6 +63,10 @@
margin-left: $grid-size;
}
+ .btn-group .btn + .btn {
+ margin-left: -1px;
+ }
+
@include media-breakpoint-down(xs) {
flex-direction: column;
@@ -72,6 +76,11 @@
margin-left: 0;
margin-top: $grid-size;
}
+
+ .btn-group .btn + .btn {
+ margin-left: -1px;
+ margin-top: 0;
+ }
}
}