diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2019-05-20 23:27:52 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2019-05-20 23:27:52 +0000 |
| commit | 127b73778527464c9c60e168ed4d1595356515eb (patch) | |
| tree | c434c55ec90166b43bf6bd381c3a59de6ba338b3 | |
| parent | d9877120e2c202ec1f3cee0e586f90b92e3eed85 (diff) | |
| parent | b083b9b3e14ddecfd98d97ab6d46116a08bd854d (diff) | |
| download | gitlab-ce-127b73778527464c9c60e168ed4d1595356515eb.tar.gz | |
Merge branch '10364-dismissal-reason-FE-CE' into 'master'
Adds the CE backport for EE!11226
See merge request gitlab-org/gitlab-ce!27835
| -rw-r--r-- | app/assets/stylesheets/framework/modal.scss | 6 |
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; } |