summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets
diff options
context:
space:
mode:
authormfluharty <mfluharty@gitlab.com>2019-07-05 12:08:20 -0600
committermfluharty <mfluharty@gitlab.com>2019-07-05 13:00:54 -0600
commit902641cc9abaecc0ea238218f1ef8390f6fff0df (patch)
tree74905f2d0798cab4c4bbf928b2f42a6aab471109 /app/assets/stylesheets
parent01fea14f51329708f21b98d9b1e0d17fdded0fbf (diff)
downloadgitlab-ce-902641cc9abaecc0ea238218f1ef8390f6fff0df.tar.gz
Set modal header/title size to match design specmf-modal-style-header-size
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)
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r--app/assets/stylesheets/framework/modal.scss10
1 files 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;
}
}
}