diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-10-03 00:58:57 +0300 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-10-03 00:58:57 +0300 |
| commit | 42822a7d45f063804fe04f44e15cf04549460ae7 (patch) | |
| tree | d6dde1aa729dbaff0bc89ccb2f99f8cc70e93ecd | |
| parent | 9087964c8c6a5d068832334b4377188fdd88d578 (diff) | |
| parent | 59d4a86014d28523f473d5827443be8600cd51e9 (diff) | |
Merge branch 'feature-flags-mvc' into 'master'
Avoid close icon leaving the modal header
See merge request gitlab-org/gitlab-ce!21904
| -rw-r--r-- | app/assets/stylesheets/framework/modal.scss | 11 | ||||
| -rw-r--r-- | changelogs/unreleased/feature-flags-mvc.yml | 5 |
2 files changed, 16 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/modal.scss b/app/assets/stylesheets/framework/modal.scss index f10eaedcc04..7e30747963a 100644 --- a/app/assets/stylesheets/framework/modal.scss +++ b/app/assets/stylesheets/framework/modal.scss @@ -19,6 +19,17 @@ } } + // leave enough space for the close icon + .modal-title { + &.mw-100, + &.w-100 { + // after upgrading to Bootstrap 4.2 we can use $modal-header-padding-x here + // https://github.com/twbs/bootstrap/pull/26976 + margin-right: -2rem; + padding-right: 2rem; + } + } + .page-title { margin-top: 0; } diff --git a/changelogs/unreleased/feature-flags-mvc.yml b/changelogs/unreleased/feature-flags-mvc.yml new file mode 100644 index 00000000000..6a709f7cf07 --- /dev/null +++ b/changelogs/unreleased/feature-flags-mvc.yml @@ -0,0 +1,5 @@ +--- +title: Avoid close icon leaving the modal header +merge_request: 21904 +author: +type: changed |