From bcdd8fbc0767115c204325363dcfc008eb4db76f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Poupard?= Date: Fri, 10 Apr 2020 20:31:58 +0200 Subject: [PATCH] Use custom properties for font-stacks (#30509) --- scss/_reboot.scss | 2 +- scss/_utilities.scss | 2 +- scss/_variables.scss | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scss/_reboot.scss b/scss/_reboot.scss index 488c0676d8..e7a1f2a11e 100644 --- a/scss/_reboot.scss +++ b/scss/_reboot.scss @@ -283,7 +283,7 @@ pre, code, kbd, samp { - font-family: $font-family-monospace; + font-family: var(--font-family-monospace); @include font-size(1em); // Correct the odd `em` font sizing in all browsers. } diff --git a/scss/_utilities.scss b/scss/_utilities.scss index a872c6bb9a..c02eec7b3e 100644 --- a/scss/_utilities.scss +++ b/scss/_utilities.scss @@ -441,7 +441,7 @@ $utilities: map-merge( "font-family": ( property: font-family, class: font, - values: (monospace: $font-family-monospace) + values: (monospace: var(--font-family-monospace)) ), "user-select": ( property: user-select, diff --git a/scss/_variables.scss b/scss/_variables.scss index ec1ba224de..6123f3ce1d 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -369,7 +369,7 @@ $embed-responsive-aspect-ratios: ( // stylelint-disable value-keyword-case $font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default; $font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !default; -$font-family-base: $font-family-sans-serif !default; +$font-family-base: var(--font-family-sans-serif) !default; // stylelint-enable value-keyword-case // $font-size-root effects the value of `rem`, which is used for as well font sizes, paddings and margins