From 9330713a49b47b4b84f572224aebab72cc02ef19 Mon Sep 17 00:00:00 2001 From: Dale Sande Date: Tue, 7 Sep 2021 16:56:12 -0700 Subject: [PATCH] feat(web fonts): include all 3 ASCircular font families #99 --- README.md | 8 ++++++++ packageScripts/postinstall.js | 13 +++++++++---- src/_fonts.scss | 4 ++-- src/_headings.scss | 4 ++++ 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 2967e5a..6d668d8 100644 --- a/README.md +++ b/README.md @@ -61,6 +61,14 @@ While WCSS is an à la carte solution, there are things that should be considere For an example of setting up a master file that imports all of WCSS's resources, see the [styleTest.scss](https://github.com/AlaskaAirlines/OrionWebCoreStyleSheets/blob/master/tests/styleTest.scss) in the project. +### Web font dependency + +WC style sheets has full support for Auro's web fonts, ASCircular. When importing `~@alaskaairux/design-tokens/dist/tokens/fonts` this will import the (3) Auro web fonts that are loaded from our CDN for `light`, `medium`, and `book` weights. + +Any references to `ASCircularWeb-Book`, `ASCircularWeb-Medium`, or `ASCircularWeb-Light` would be considered redundant and you should remove those legacy references. + +Any references to `ASCircularWeb-Bold` or any other `ASCircularWeb-` style font family is not supported and these references are considered fully deprecated. + ## Pre-processed bundled resources diff --git a/packageScripts/postinstall.js b/packageScripts/postinstall.js index 941d5aa..6db5322 100644 --- a/packageScripts/postinstall.js +++ b/packageScripts/postinstall.js @@ -21,12 +21,17 @@ chalk.hex('#f26135')(` Thanks for installing the latest version of `) + chalk.hex('#ffd200').bold(`WC Stylesheets v${pjson.version}.`) + chalk.hex('#f26135')(` - Legacy Orion selectors have been deleted! - You have been warned! - - Be sure to update Design Tokens + Requires Design Tokens v3.4.0 npm i @alaskaairux/design-tokens@latest ╰─────────────────────────────── ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─╯ +`) + chalk.hex('#ffd200').bold(` +Any references to ASCircularWeb-Book, ASCircularWeb-Medium, +or ASCircularWeb-Light would be considered redundant and +you should remove those legacy references. + +Any references to ASCircularWeb-Bold or any other +ASCircularWeb- style font family is not supported +and these references are considered fully deprecated. `) ); diff --git a/src/_fonts.scss b/src/_fonts.scss index fbe30aa..31a69f0 100644 --- a/src/_fonts.scss +++ b/src/_fonts.scss @@ -32,8 +32,8 @@ font-style: normal; font-display: fallback; - src: url('https://resource.alaskaair.net/-/media/4E8D77C0D7A8411AB9C351C1EFF86681.woff2') format('woff2'), - url('https://resource.alaskaair.net/-/media/CAAEEC88586944808EDE9B36A3460098.woff') format('woff'); + src: url("https://resource.alaskaair.net/-/media/A5558137DB0F4B818D85EBE44FDC542E.woff2") format("woff2"), + url("https://resource.alaskaair.net/-/media/F4E82B6C6CBA46B4A322B4B99B2CBC63.woff") format("woff"); } /// Baseline font-face setting for using web based custom fonts - font weight book diff --git a/src/_headings.scss b/src/_headings.scss index 50e0a40..816530b 100644 --- a/src/_headings.scss +++ b/src/_headings.scss @@ -152,6 +152,7 @@ margin: $auro-size-md 0; font-size: $auro-text-heading-600-size-breakpoint-sm; + font-weight: $auro-text-heading-600-weight; line-height: $auro-text-heading-600-height-breakpoint-sm; @include auro_breakpoint--md { @@ -185,6 +186,7 @@ margin: $auro-size-md 0; font-size: $auro-text-heading-500-size-breakpoint-sm; + font-weight: $auro-text-heading-500-weight; line-height: $auro-text-heading-500-height-breakpoint-sm; @include auro_breakpoint--md { @@ -218,6 +220,7 @@ margin: $auro-size-sm 0; font-size: $auro-text-heading-400-size; + font-weight: $auro-text-heading-400-weight; line-height: $auro-text-heading-400-height; } @@ -242,5 +245,6 @@ margin: $auro-size-sm 0; font-size: $auro-text-heading-300-size; + font-weight: $auro-text-heading-300-weight; line-height: $auro-text-heading-300-height; }