diff options
| author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-07-12 00:05:31 +0300 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-07-12 00:05:31 +0300 |
| commit | 9ed6e5896102b6fd8ed1e66260ef701054fcc2a0 (patch) | |
| tree | fd964e2b2f877ce67733d071ae3eb923457f22d1 /app | |
| parent | 990d7ecedb75fc893e1409a5150844d59b8a5c0c (diff) | |
| parent | 902641cc9abaecc0ea238218f1ef8390f6fff0df (diff) | |
Merge branch 'mf-modal-style-header-size' into 'master'
Set modal header/title size to match design spec
See merge request gitlab-org/gitlab-ce!30420
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/framework/modal.scss | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/stylesheets/framework/modal.scss b/app/assets/stylesheets/framework/modal.scss index 68eb9036b65..9520558a27b 100644 --- a/app/assets/stylesheets/framework/modal.scss +++ b/app/assets/stylesheets/framework/modal.scss @@ -19,14 +19,14 @@ } } - // leave enough space for the close icon .modal-title { + line-height: $gl-line-height-24; + + // leave enough space for the close icon &.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: -28px; - padding-right: 28px; + margin-right: -$modal-header-padding-x; + padding-right: $modal-header-padding-x; } } } |