From 360226de31f8c5bcbb03ba0eb2f5e4b36aaf65ad Mon Sep 17 00:00:00 2001 From: m26lebla <m26lebla@uwaterloo.ca> Date: Wed, 15 Jul 2020 14:37:27 -0400 Subject: [PATCH] adding the default color to be white text on black bg and adjusting to new font sizes in gesso-font-size function --- css/styles.css | 26 ++++++++++--------- .../_territorial-statement.scss | 5 ++-- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/css/styles.css b/css/styles.css index 4a727807..8553e354 100644 --- a/css/styles.css +++ b/css/styles.css @@ -1141,7 +1141,7 @@ svg:not(:root) { .uw-footer__territorial { grid-column: 1 / 4; grid-row: 4 / 5; } - @media (min-width: 30em) { + @media (min-width: 48.06rem) { .uw-footer__territorial { grid-row: 3 / 4; } } @@ -4304,8 +4304,9 @@ picture { .uw-territorial { text-align: center; } .uw-territorial p { + color: #fff; font-family: Typ1451-Regular; - font-size: 0.75rem; + font-size: 0.79rem; font-weight: 200; letter-spacing: 0.5px; line-height: 1.7; @@ -4314,17 +4315,18 @@ picture { color: #fff; } .uw-bg--white .uw-territorial p { color: #000; } - .uw-bg--black .uw-territorial a { - color: #fdd54f; - text-decoration: none; } - .uw-bg--black .uw-territorial a:hover { - text-decoration: underline; } - .uw-bg--white .uw-territorial a { - color: #000; - text-decoration: underline; } - .uw-bg--white .uw-territorial a:hover { + .uw-territorial a { + color: #fdd54f; } + .uw-bg--black .uw-territorial a { text-decoration: none; } - @media (min-width: 49.81em) { + .uw-bg--black .uw-territorial a:hover { + text-decoration: underline; } + .uw-bg--white .uw-territorial a { + color: #000; + text-decoration: underline; } + .uw-bg--white .uw-territorial a:hover { + text-decoration: none; } + @media (min-width: 63.1875rem) { .uw-territorial { text-align: left; } .uw-territorial p { diff --git a/source/_patterns/04-components/territorial-statement/_territorial-statement.scss b/source/_patterns/04-components/territorial-statement/_territorial-statement.scss index 96e6675f..f0da012d 100644 --- a/source/_patterns/04-components/territorial-statement/_territorial-statement.scss +++ b/source/_patterns/04-components/territorial-statement/_territorial-statement.scss @@ -7,8 +7,9 @@ .uw-territorial{ text-align:center; p{ + color:gesso-brand(org-default,uw-white,lvl1); font-family: Typ1451-Regular; - font-size: rem(gesso-font-size(0)); + font-size: rem(gesso-font-size(-2)); font-weight:200; letter-spacing:0.5px; line-height:1.7; @@ -17,8 +18,8 @@ .uw-bg--white &{color:gesso-brand(org-default,uw-black,lvl4);} } a { + color: gesso-brand(org-default, uw-gold, primary); .uw-bg--black & { - color: gesso-brand(org-default, uw-gold, primary); text-decoration: none; &:hover { text-decoration:underline; -- GitLab