diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2019-01-03 15:14:27 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2019-01-03 15:14:27 +0000 |
| commit | 9db22922dd028ba7baf4059a00d8ed965e6865ff (patch) | |
| tree | 0b6d668a4942ab8d92b24dfe6c99a749fb093a4f | |
| parent | 97e526d872c150005e36832cea6ef5894408cb4c (diff) | |
| parent | 47b57de8997dd9a256de141ebed59b73f198a2b1 (diff) | |
| download | gitlab-ce-9db22922dd028ba7baf4059a00d8ed965e6865ff.tar.gz | |
Merge branch '55883-modal-header-titles-have-an-unnecessary-top-margin' into 'master'
Remove unnecessary top margin in modal header titles
Closes #55883
See merge request gitlab-org/gitlab-ce!24108
3 files changed, 19 insertions, 5 deletions
diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss index f0671e36130..b7dbb48632e 100644 --- a/app/assets/stylesheets/bootstrap_migration.scss +++ b/app/assets/stylesheets/bootstrap_migration.scss @@ -70,6 +70,17 @@ h6, margin-bottom: 10px; } +/* Our adjustments to hx & .hx above add unnecessary margins to modal-title + and page-title in modals, so we set them to 0 in order to have properly + formatted modal headers. */ +.modal-header { + .modal-title, + .page-title { + margin-top: 0; + margin-bottom: 0; + } +} + h5, .h5 { font-size: $gl-font-size; @@ -142,7 +153,9 @@ table { @include media-breakpoint-up($breakpoint) { $infix: breakpoint-infix($breakpoint, $grid-breakpoints); - .d#{$infix}-table-header-group { display: table-header-group !important; } + .d#{$infix}-table-header-group { + display: table-header-group !important; + } } } diff --git a/app/assets/stylesheets/framework/modal.scss b/app/assets/stylesheets/framework/modal.scss index 95291b4a9ad..46d40ea7aa5 100644 --- a/app/assets/stylesheets/framework/modal.scss +++ b/app/assets/stylesheets/framework/modal.scss @@ -29,10 +29,6 @@ padding-right: 28px; } } - - .page-title { - margin-top: 0; - } } .modal-body { diff --git a/changelogs/unreleased/55883-modal-header-titles-have-an-unnecessary-top-margin.yml b/changelogs/unreleased/55883-modal-header-titles-have-an-unnecessary-top-margin.yml new file mode 100644 index 00000000000..7dc783cc2b8 --- /dev/null +++ b/changelogs/unreleased/55883-modal-header-titles-have-an-unnecessary-top-margin.yml @@ -0,0 +1,5 @@ +--- +title: Remove top margin in modal header titles +merge_request: 24108 +author: +type: fixed |