From 604e13e007dfdc83bf83dccfc2015a8443873109 Mon Sep 17 00:00:00 2001 From: Dave Lockhart Date: Fri, 24 May 2019 15:41:11 -0400 Subject: [PATCH 1/2] labels should no longer have a responsive breakpoint --- d2l-typography.html | 4 ---- d2l-typography.scss | 6 ------ 2 files changed, 10 deletions(-) diff --git a/d2l-typography.html b/d2l-typography.html index 2ae4fbb..c577ff7 100644 --- a/d2l-typography.html +++ b/d2l-typography.html @@ -134,10 +134,6 @@ font-size: 0.6rem; line-height: 0.9rem; } - .d2l-typography .d2l-label-text { - font-size: 0.6rem; - line-height: 0.9rem; - } } diff --git a/d2l-typography.scss b/d2l-typography.scss index ff36b6c..5e4411f 100644 --- a/d2l-typography.scss +++ b/d2l-typography.scss @@ -166,10 +166,4 @@ line-height: 1rem; font-weight: 700; letter-spacing: 0.2px; - @media (max-width: 615px) { - font-size: 0.6rem; - line-height: 0.9rem; - font-weight: 700; - letter-spacing: 0.2px; - } } From 44f40494f33b3639c1b19cb4ff875e944fecfef3 Mon Sep 17 00:00:00 2001 From: Dave Lockhart Date: Fri, 24 May 2019 15:17:07 -0400 Subject: [PATCH 2/2] updating galen tests with new palette --- test/acceptance/typography.gspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/acceptance/typography.gspec b/test/acceptance/typography.gspec index 9ae911e..800bfc0 100644 --- a/test/acceptance/typography.gspec +++ b/test/acceptance/typography.gspec @@ -22,7 +22,7 @@ = Typography classes = @on desktop paragraph: - css color matches "#565a5c|rgba\\(86, 90, 92, 1\\)|rgb\\(86, 90, 92\\)" + css color matches "#494c4e|rgba\\(73, 76, 78, 1\\)|rgb\\(73, 76, 78\\)" css font-family matches "(?i)['|\"]*lato['|\"]*,\\s*['|\"]lucida sans unicode['|\"],\\s*['|\"]lucida grande['|\"],\\s*sans-serif" css font-size is "19px" css font-weight matches "normal|400" @@ -81,7 +81,7 @@ css font-size is "16px" css line-height is "24px" small: - css color matches "#72777a|rgba\\(114, 119, 122, 1\\)|rgb\\(114, 119, 122\\)" + css color matches "#6e7376|rgba\\(110, 115, 118, 1\\)|rgb\\(110, 115, 118\\)" css font-size is "14px" css line-height is "20px" @on mobile