diff --git a/web/app/themes/mitlib-child/style.css b/web/app/themes/mitlib-child/style.css index a946ab43..23f882aa 100644 --- a/web/app/themes/mitlib-child/style.css +++ b/web/app/themes/mitlib-child/style.css @@ -1,7 +1,7 @@ /* Theme Name: MITlib Child Author: MIT Libraries -Version: 1.0.2 +Version: 1.3 Description: A child theme of the MIT Libraries' parent, focused on sites built primarily with static pages. Template: mitlib-parent @@ -44,14 +44,6 @@ b, strong { word-wrap: normal; } -.childTheme ul { - list-style-type:none; -} - -.childTheme ol { - list-style-type:decimal; -} - .childTheme hr { border:1px solid #eee; margin:2em 0; @@ -605,49 +597,6 @@ dd.wp-caption-text { text-transform: uppercase; } -.entry-content h2 { - font-size:21px; - font-size:1.3rem; - line-height:1.3; - font-weight: 600; - margin-top: .75em; - margin-bottom: .3em; -} - -.entry-content h3 { - margin: 1em 0 .3em 0; - font-size:18px; - font-size:1.1rem; - font-weight: 600; - line-height:1.3; -} - -.entry-content h4 { - margin: 1em 0 .3em 0; - font-size:16px; - font-size:1rem; - font-weight: 600; - line-height:1.3; -} - -.entry-content h5 { - margin: 1em 0 .3em 0; - padding: 0; - font-size:15px; - font-size:.9rem; - font-weight: 600; - line-height:1.3; -} - -.entry-content h6 { - margin: 1em 0 .3em 0; - font-size:13px; - font-size:.8rem; - font-weight: 600; - line-height:1.3; - text-transform: uppercase; -} - .main-content .post h2,.category .post h3,.search .post h3 { font-size:24px; line-height:28px; @@ -666,14 +615,6 @@ dd.wp-caption-text { margin-top:10px; } -.post ul, -.post ol, -.main-content .entry-content ul, -.main-content .entry-content ol { - margin-left:1em; - margin-bottom: 20px; -} - .post:not(:last-of-type):after { background:#ccc; content:''; diff --git a/web/app/themes/mitlib-parent/css/scss/_main.scss b/web/app/themes/mitlib-parent/css/scss/_main.scss index 3797d913..3bbc00e6 100644 --- a/web/app/themes/mitlib-parent/css/scss/_main.scss +++ b/web/app/themes/mitlib-parent/css/scss/_main.scss @@ -82,13 +82,6 @@ img { padding: 20px 20px 20px 20px; } -.entry-content ul li { - list-style: disc; - margin-left: 40px; - margin-bottom: 5px; - line-height: 23px; -} - .entry-content ul, #mainContent ul { margin-bottom: 10px; } diff --git a/web/app/themes/mitlib-parent/css/scss/partials/_home.scss b/web/app/themes/mitlib-parent/css/scss/partials/_home.scss index 49d9c442..1c896f69 100644 --- a/web/app/themes/mitlib-parent/css/scss/partials/_home.scss +++ b/web/app/themes/mitlib-parent/css/scss/partials/_home.scss @@ -5,7 +5,7 @@ body.page-home { color: #fff; } -// this rule restricts old and poorly scoped header styling to the main libraries homepage +// these rules override our central typography styles to preserve the original design of the homepage .libraries-home { h1, @@ -13,6 +13,18 @@ body.page-home { h3 { font-weight: 300; } + + h2 { + @include rem-first(font-size, 2.125); + margin: 0; + } + + .wrap-loc-info, .excerpt-news { + h3 { + @include rem-first(font-size, 1.375); + margin: 0; + } + } } .home { diff --git a/web/app/themes/mitlib-parent/css/scss/partials/_locations.scss b/web/app/themes/mitlib-parent/css/scss/partials/_locations.scss index e7432c60..2e00717f 100644 --- a/web/app/themes/mitlib-parent/css/scss/partials/_locations.scss +++ b/web/app/themes/mitlib-parent/css/scss/partials/_locations.scss @@ -1,4 +1,9 @@ .locationPage { + h3 { + @include bp-tablet--portrait { + font-size: 1.375em; + } + } .reserve { background: #666; color: #fff; diff --git a/web/app/themes/mitlib-parent/css/scss/partials/_typography.scss b/web/app/themes/mitlib-parent/css/scss/partials/_typography.scss index ce55fde6..6a4cedfb 100644 --- a/web/app/themes/mitlib-parent/css/scss/partials/_typography.scss +++ b/web/app/themes/mitlib-parent/css/scss/partials/_typography.scss @@ -6,32 +6,81 @@ body { } h1 { - @include rem-first(font-size, 2.25); + @include rem-first(font-size, 1.75); font-weight: 400; + line-height: 1.25; } -h2 { - @include rem-first(font-size, 1.825); +h2, h3, h4, h5, h6 { font-weight: 400; - @include bp-tablet--landscape { - font-size: 2.125em; - } - a { - font-weight: 400; - } + margin: 15px 0 10px; + line-height: 1.25; + + a {font-weight: 400;} +} + +h2 { + @include rem-first(font-size, 1.29); + font-weight: 600; } h3 { - font-size: 1.25em; - font-weight: 400; - @include bp-tablet--portrait { - font-size: 1.375em; + @include rem-first(font-size, 1.14); + font-weight: 600; +} + +h4 { + @include rem-first(font-size, 1); + font-weight: 700; +} + +h5 { + @include rem-first(font-size, 0.85); + font-weight: 700; +} + +h6 { + @include rem-first(font-size, 0.85); +} + +/* Page / Post Content typography */ +.post, +.entry-content, +.comment-content, +.mu_register { + + ul { + list-style: disc outside; + margin: 0 0 1.715rem; } - a { - font-weight: 400; + + ol { + list-style: decimal outside none; + margin: 0 0 1.715rem; + } + + ul ul, ol ol, ol ol, ul ol, ol ul { margin-bottom: 0; } + + li { + margin: 0 0 8px 2.25rem; + line-height: 1.5em; + + ol, ul { + padding-top: 8px; + } + } + + ul.arrows li{ + list-style: none !important; + } + + p { + margin: 0 0 24px; + line-height: 1.7; } } + a { color: $brand-primary; text-decoration: none; diff --git a/web/app/themes/mitlib-parent/css/scss/partials/pages/_hours.scss b/web/app/themes/mitlib-parent/css/scss/partials/pages/_hours.scss index ac398e16..1b64def2 100644 --- a/web/app/themes/mitlib-parent/css/scss/partials/pages/_hours.scss +++ b/web/app/themes/mitlib-parent/css/scss/partials/pages/_hours.scss @@ -450,3 +450,11 @@ div.libraryAlert { width: 100% !important; } } + +/* Overriding new centralized heading styles */ +.page-hours h3 { + @include bp-tablet--portrait { + font-size: 1.375em; + } + margin: 0; +} diff --git a/web/app/themes/mitlib-parent/style.css b/web/app/themes/mitlib-parent/style.css index d14a6559..c379f07e 100644 --- a/web/app/themes/mitlib-parent/style.css +++ b/web/app/themes/mitlib-parent/style.css @@ -1,7 +1,7 @@ /* Theme Name: MITlib Parent Author: MIT Libraries -Version: 0.5 +Version: 0.6 Description: The parent theme for the MIT Libraries' Pentagram-designed identity. */ @@ -664,107 +664,7 @@ article.sticky .featured-post { margin-bottom: 1.714285714rem; line-height: 1.25; } -/* .entry-content h2, -.comment-content h2, -.entry-content h3, -.comment-content h3, -.entry-content h4, -.comment-content h4, -.entry-content h5, -.comment-content h5, -.entry-content h6, -.comment-content h6 { - margin: 24px 0; - margin: 1.714285714rem 0; - line-height: 1.714285714; -} */ - -.entry-content h1, -.comment-content h1 { - font-size: 2rem; - font-size: 28px; - line-height: 1.25; -} -.entry-content h2, -.comment-content h2, -.mu_register h2 { - font-size: 1.285714286rem; - line-height: 1.25; - margin: 15px 0 10px; -} -.entry-content h3, -.comment-content h3 { - font-size: 1.142857143rem; - line-height: 1.25; - margin: 15px 0 10px; -} -.entry-content h4, -.comment-content h4 { - font-size: 14px; - font-size: 1rem; - line-height: 1.846153846; - margin: 15px 0 10px; -} -.entry-content h5, -.comment-content h5 { - font-size: 0.928571429rem; - font-size: 13px; - line-height: 1.846153846; - margin: 15px 0 10px; -} -.entry-content h6, -.comment-content h6 { - font-size: 0.857142857rem; - font-size: 12px; - line-height: 1.846153846; - margin: 15px 0 10px; -} -.entry-content p, -.entry-summary p, -.comment-content p, -.mu_register p { - margin: 0 0 24px; - margin: 0 0 1.714285714rem; - line-height: 1.714285714; -} -.entry-content ol, -.comment-content ol, -.entry-content ul, -.comment-content ul, -.mu_register ul { - margin: 0 0 24px; - margin: 0 0 1.714285714rem; - line-height: 1.714285714; -} -.entry-content ul ul, -.comment-content ul ul, -.entry-content ol ol, -.comment-content ol ol, -.entry-content ul ol, -.comment-content ul ol, -.entry-content ol ul, -.comment-content ol ul { - margin-bottom: 0; -} -.entry-content ul, -.comment-content ul, -.mu_register ul { - list-style: disc outside; -} -.entry-content ul.arrows li{ - list-style: none !important; -} -.entry-content ol, -.comment-content ol { - list-style: decimal outside none; -} -.entry-content li, -.comment-content li, -.mu_register li { - margin: 0 0 0 36px; - margin: 0 0 0 2.571428571rem; -} .entry-content blockquote, .comment-content blockquote { margin-bottom: 24px;