From 4b58c9daea912950bf0a855c8a6fbddcaa67cde5 Mon Sep 17 00:00:00 2001 From: Gemma Leigh Date: Wed, 3 Aug 2016 14:56:10 +0100 Subject: [PATCH 1/2] Move the font-size-adjust properties MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We don’t want these to apply to nta-tabular numbers or for print. Move these properties, so that once the toolkit-font-stack is defined, we can check to see if the $toolkit-font-stack variable is $NTA-Light and if so, apply the font-size-adjust values. --- stylesheets/_typography.scss | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/stylesheets/_typography.scss b/stylesheets/_typography.scss index 4b7b169b..ea14b33b 100644 --- a/stylesheets/_typography.scss +++ b/stylesheets/_typography.scss @@ -27,20 +27,19 @@ $is-print: false !default; font-family: $Print-reset; } @else { font-family: $toolkit-font-stack; + @if $toolkit-font-stack == $NTA-Light { + @if $font-weight > 400 { + font-size-adjust: 0.525; + } @else { + font-size-adjust: 0.5; + } + } } font-size: $font-size-640; line-height: $line-height-640; font-weight: $font-weight; text-transform: none; - @if $toolkit-font-stack == $NTA-Light { - @if $font-weight > 400 { - font-size-adjust: 0.525; - } @else { - font-size-adjust: 0.5; - } - } - @include media(tablet) { font-size: $font-size; line-height: $line-height; From 3aa8929e809930669fb91a8e62c8b64d7fcac9f0 Mon Sep 17 00:00:00 2001 From: Gemma Leigh Date: Wed, 3 Aug 2016 15:12:32 +0100 Subject: [PATCH 2/2] Check for the string $NTA-Light, not that the variable exists --- stylesheets/_typography.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stylesheets/_typography.scss b/stylesheets/_typography.scss index ea14b33b..34a64f08 100644 --- a/stylesheets/_typography.scss +++ b/stylesheets/_typography.scss @@ -27,7 +27,7 @@ $is-print: false !default; font-family: $Print-reset; } @else { font-family: $toolkit-font-stack; - @if $toolkit-font-stack == $NTA-Light { + @if $toolkit-font-stack == "$NTA-Light" { @if $font-weight > 400 { font-size-adjust: 0.525; } @else {