diff options
author | Fatih Acet <acetfatih@gmail.com> | 2019-07-11 21:07:43 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2019-07-11 21:07:43 +0000 |
commit | edf7157521efc88d91d5136e07bc2b670d592fbb (patch) | |
tree | dabfc07a1ee0938a60e609ac06b661ce23975992 /app/assets/stylesheets | |
parent | 9ed6e5896102b6fd8ed1e66260ef701054fcc2a0 (diff) | |
parent | 45a1c998a6971333ad6a3c5f2cac425c4f04e5f7 (diff) | |
download | gitlab-ce-edf7157521efc88d91d5136e07bc2b670d592fbb.tar.gz |
Merge branch '10364-dismissal-reason-any-comment-CE' into 'master'
CE backport for Dismissal Reasons
See merge request gitlab-org/gitlab-ce!29422
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r-- | app/assets/stylesheets/framework/modal.scss | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/modal.scss b/app/assets/stylesheets/framework/modal.scss index 9520558a27b..0ffdbe9143a 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; + } } } |