Skip to content

Commit

Permalink
feat(web fonts): include all 3 ASCircular font families #99
Browse files Browse the repository at this point in the history
  • Loading branch information
blackfalcon committed Oct 8, 2021
1 parent 683f477 commit d99dfce
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 7 deletions.
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"url": "https://github.com/AlaskaAirlines/WebCoreStyleSheets"
},
"peerDependencies": {
"@alaskaairux/design-tokens": "^3.0.0",
"@alaskaairux/design-tokens": "^3.4.0",
"node-sass": "^4.11.0"
},
"dependencies": {
Expand Down
13 changes: 9 additions & 4 deletions packageScripts/postinstall.js
Original file line number Diff line number Diff line change
Expand Up @@ -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.
`)
);
4 changes: 2 additions & 2 deletions src/_fonts.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions src/_headings.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
}

Expand All @@ -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;
}

0 comments on commit d99dfce

Please sign in to comment.