Commit 127b7377 authored by Clement Ho's avatar Clement Ho

Merge branch '10364-dismissal-reason-FE-CE' into 'master'

Adds the CE backport for EE!11226

See merge request gitlab-org/gitlab-ce!27835
parents d9877120 b083b9b3
...@@ -53,7 +53,8 @@ ...@@ -53,7 +53,8 @@
flex-direction: row; flex-direction: row;
.btn + .btn:not(.dropdown-toggle-split), .btn + .btn:not(.dropdown-toggle-split),
.btn + .btn-group { .btn + .btn-group,
.btn-group + .btn {
margin-left: $grid-size; margin-left: $grid-size;
} }
...@@ -61,7 +62,8 @@ ...@@ -61,7 +62,8 @@
flex-direction: column; flex-direction: column;
.btn + .btn:not(.dropdown-toggle-split), .btn + .btn:not(.dropdown-toggle-split),
.btn + .btn-group { .btn + .btn-group,
.btn-group + .btn {
margin-left: 0; margin-left: 0;
margin-top: $grid-size; margin-top: $grid-size;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment