summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Beckham <sbeckham@gitlab.com>2019-05-20 23:27:51 +0000
committerClement Ho <clemmakesapps@gmail.com>2019-05-20 23:27:51 +0000
commitb083b9b3e14ddecfd98d97ab6d46116a08bd854d (patch)
treec434c55ec90166b43bf6bd381c3a59de6ba338b3
parentd9877120e2c202ec1f3cee0e586f90b92e3eed85 (diff)
downloadgitlab-ce-b083b9b3e14ddecfd98d97ab6d46116a08bd854d.tar.gz
Adds a CE backport for 11226
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/11226
-rw-r--r--app/assets/stylesheets/framework/modal.scss6
1 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/modal.scss b/app/assets/stylesheets/framework/modal.scss
index e2bb1eb67c0..f75e5b55506 100644
--- 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;
}