From b636a9cbeaab962c26a53ea7417e609610c19384 Mon Sep 17 00:00:00 2001 From: Akira Sudoh Date: Fri, 18 May 2018 00:30:43 +0900 Subject: [PATCH] fix(font-face): bring missing $css--font-face reference back (#778) Fixes #777. --- src/globals/scss/_css--font-face.scss | 10 ++++++---- src/globals/scss/styles.scss | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/globals/scss/_css--font-face.scss b/src/globals/scss/_css--font-face.scss index a3f39d98eac9..73495c245a6f 100644 --- a/src/globals/scss/_css--font-face.scss +++ b/src/globals/scss/_css--font-face.scss @@ -57,9 +57,11 @@ $font-path: 'https://unpkg.com/carbon-components@latest/src/globals/fonts' !defa } @include exports('css--font-face') { - @if global-variable-exists('css--plex') and $css--plex == true { - @include plex-font-face; - } @else { - @include helvetica-font-face; + @if not global-variable-exists('css--font-face') or $css--font-face == true { + @if global-variable-exists('css--plex') and $css--plex == true { + @include plex-font-face; + } @else { + @include helvetica-font-face; + } } } diff --git a/src/globals/scss/styles.scss b/src/globals/scss/styles.scss index 970ea3665c25..36c474553922 100644 --- a/src/globals/scss/styles.scss +++ b/src/globals/scss/styles.scss @@ -2,7 +2,7 @@ // 🌍 Global //------------------------- -$css--font-face: false !default; +$css--font-face: true !default; $css--helpers: true !default; $css--body: true !default; $css--use-experimental-grid: false !default;