diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-10-01 15:48:35 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-10-01 15:48:35 +0000 |
| commit | 7b35782866f8d1bbbbc04d2f01446c54ada43397 (patch) | |
| tree | 4c7699573a25c9347aed1ff9dd8b856fa572f4a2 | |
| parent | 70f4a26b6ec6401a1cfaf620495a4209d503df7a (diff) | |
| parent | 337e87d9f8f9df5670df8bfdb7aff947191db5b2 (diff) | |
| download | gitlab-ce-7b35782866f8d1bbbbc04d2f01446c54ada43397.tar.gz | |
Merge branch '45453-fix-delete-protected-branch-btn' into 'master'
Fixes modal button alignment for protected branches
The buttons in the footer were misaligned due to our CSS
styling only buttons correctly. The CSS was updated to
look for the first element regardless of its type.
Closes #45453
See merge request gitlab-org/gitlab-ce!22024
| -rw-r--r-- | app/assets/stylesheets/framework/modal.scss | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/45453-fix-delete-protected-branch-btn.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/modal.scss b/app/assets/stylesheets/framework/modal.scss index 7d53a631cdf..f10eaedcc04 100644 --- a/app/assets/stylesheets/framework/modal.scss +++ b/app/assets/stylesheets/framework/modal.scss @@ -59,7 +59,7 @@ } @include media-breakpoint-up(sm) { - .btn:first-of-type { + .btn:nth-child(1) { margin-left: auto; } } diff --git a/changelogs/unreleased/45453-fix-delete-protected-branch-btn.yml b/changelogs/unreleased/45453-fix-delete-protected-branch-btn.yml new file mode 100644 index 00000000000..64776abdc07 --- /dev/null +++ b/changelogs/unreleased/45453-fix-delete-protected-branch-btn.yml @@ -0,0 +1,5 @@ +--- +title: Fixes modal button alignment +merge_request: 22024 +author: Jacopo Beschi @jacopo-beschi +type: fixed |