From 8feb275959abbdca90e1e34d1b3f4380824c94cb Mon Sep 17 00:00:00 2001 From: bcanini <canini.16@osu.edu> Date: Fri, 1 Mar 2019 14:48:11 -0500 Subject: [PATCH] asc_gateway - style updates for webform and headings --- .../assets/sass/layout/_default.scss | 57 ++++++++++++++-- .../assets/sass/pages/_front-page.scss | 2 +- web/themes/asc_gateway/css/style.css | 67 ++++++++++++++++--- 3 files changed, 112 insertions(+), 14 deletions(-) diff --git a/web/themes/asc_gateway/assets/sass/layout/_default.scss b/web/themes/asc_gateway/assets/sass/layout/_default.scss index a95011b1fb..5ddeeac363 100644 --- a/web/themes/asc_gateway/assets/sass/layout/_default.scss +++ b/web/themes/asc_gateway/assets/sass/layout/_default.scss @@ -189,10 +189,6 @@ p, a, ul, ol, li { -moz-osx-font-smoothing: grayscale; } -h2, h3, h4, h5, h6 { - font-weight: 500; -} - .page-node-type-page section { padding-right: 65px; @@ -205,3 +201,56 @@ h2, h3, h4, h5, h6 { .region-top-head section { padding-right: 0px; } + + +// +// Webforms +// -------------------------------------------------- + +.form-inline .control-label { + margin-bottom: 5px; +} + +label { + width: 100%; +} + +// -------------------------------------------------- + +//## Headings. + +h1, h2, h3, h4, h5, h6 { + margin: 11px 0; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +h1 { + font-weight: bold; + line-height: 33px; +} + +h2 { + line-height: 26px; +} + +h3 { + line-height: 22px; +} + +h4 { + line-height: 17px; +} + +h5, h6 { + line-height: 15px; + text-transform: uppercase; +} + +h5 { + font-weight: 600; +} + +h6 { + font-weight: 500; +} diff --git a/web/themes/asc_gateway/assets/sass/pages/_front-page.scss b/web/themes/asc_gateway/assets/sass/pages/_front-page.scss index 5d3f01ce5e..33b15922fd 100644 --- a/web/themes/asc_gateway/assets/sass/pages/_front-page.scss +++ b/web/themes/asc_gateway/assets/sass/pages/_front-page.scss @@ -15,7 +15,7 @@ .menu-card { background: $brand-lgray; flex: 1; - min-height: 375px; + min-height: 385px; position: relative; h2 { diff --git a/web/themes/asc_gateway/css/style.css b/web/themes/asc_gateway/css/style.css index d82f99db26..ecac90f42a 100644 --- a/web/themes/asc_gateway/css/style.css +++ b/web/themes/asc_gateway/css/style.css @@ -8994,27 +8994,76 @@ p, a, ul, ol, li { -moz-osx-font-smoothing: grayscale; } -/* line 192, ../assets/sass/layout/_default.scss */ -h2, h3, h4, h5, h6 { - font-weight: 500; -} - -/* line 197, ../assets/sass/layout/_default.scss */ +/* line 193, ../assets/sass/layout/_default.scss */ .page-node-type-page section { padding-right: 65px; } @media (max-width: 768px) { - /* line 197, ../assets/sass/layout/_default.scss */ + /* line 193, ../assets/sass/layout/_default.scss */ .page-node-type-page section { padding-right: 15px; } } -/* line 205, ../assets/sass/layout/_default.scss */ +/* line 201, ../assets/sass/layout/_default.scss */ .region-top-head section { padding-right: 0px; } +/* line 210, ../assets/sass/layout/_default.scss */ +.form-inline .control-label { + margin-bottom: 5px; +} + +/* line 214, ../assets/sass/layout/_default.scss */ +label { + width: 100%; +} + +/* line 222, ../assets/sass/layout/_default.scss */ +h1, h2, h3, h4, h5, h6 { + margin: 11px 0; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +/* line 228, ../assets/sass/layout/_default.scss */ +h1 { + font-weight: bold; + line-height: 33px; +} + +/* line 233, ../assets/sass/layout/_default.scss */ +h2 { + line-height: 26px; +} + +/* line 237, ../assets/sass/layout/_default.scss */ +h3 { + line-height: 22px; +} + +/* line 241, ../assets/sass/layout/_default.scss */ +h4 { + line-height: 17px; +} + +/* line 245, ../assets/sass/layout/_default.scss */ +h5, h6 { + line-height: 15px; + text-transform: uppercase; +} + +/* line 250, ../assets/sass/layout/_default.scss */ +h5 { + font-weight: 600; +} + +/* line 254, ../assets/sass/layout/_default.scss */ +h6 { + font-weight: 500; +} + /* line 8, ../assets/sass/layout/_aside.scss */ .path-frontpage aside { margin-top: 30px; @@ -9789,7 +9838,7 @@ a.carousel-control:hover { .menu-card { background: #F5F5F5; flex: 1; - min-height: 375px; + min-height: 385px; position: relative; } /* line 21, ../assets/sass/pages/_front-page.scss */ -- GitLab