From 902641cc9abaecc0ea238218f1ef8390f6fff0df Mon Sep 17 00:00:00 2001 From: mfluharty Date: Fri, 5 Jul 2019 12:08:20 -0600 Subject: Set modal header/title size to match design spec Set line height of title to 24px as given in spec Given 16px padding, total header height is now 56px as given in spec Use variables for padding/margin for close button (bootstrap now >4.2) --- app/assets/stylesheets/framework/modal.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/framework/modal.scss b/app/assets/stylesheets/framework/modal.scss index f75e5b55506..cb613606fb7 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; } } } -- cgit v1.2.1