diff options
| author | Luke Bennett <lbennett@gitlab.com> | 2019-03-08 04:25:32 +0300 |
|---|---|---|
| committer | Luke Bennett <lbennett@gitlab.com> | 2019-03-08 04:25:32 +0300 |
| commit | 0a4effd4b8cd2efd88e63ac693c0541632f88263 (patch) | |
| tree | c7c449f6e36f8f13c2b3c9c01b67da3c89738633 /app | |
| parent | b7b5cd7a11e520ba6871d96d51739b747dccba5d (diff) | |
| parent | 147280615ab0e9aa7b9afc17a23297b8d795ea0a (diff) | |
Merge branch '9224-create-mr-from-vulnerabilty-feedback-fe' into 'master'
Fixes split button styling in modal footers (CE port)
See merge request gitlab-org/gitlab-ce!25869
Diffstat (limited to 'app')
| -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 3703b7568c8..53222a2bd4d 100644 --- a/app/assets/stylesheets/framework/modal.scss +++ b/app/assets/stylesheets/framework/modal.scss @@ -52,14 +52,16 @@ display: flex; flex-direction: row; - .btn + .btn { + .btn + .btn:not(.dropdown-toggle-split), + .btn + .btn-group { margin-left: $grid-size; } @include media-breakpoint-down(xs) { flex-direction: column; - .btn + .btn { + .btn + .btn:not(.dropdown-toggle-split), + .btn + .btn-group { margin-left: 0; margin-top: $grid-size; } |