Skip to content

feat: add ASCircularWeb Medium and Bold @font-face registrations AB#1605294 #290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sun-mota wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: add ASCircularWeb Medium and Bold @font-face registrations AB#1605294 #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docs/index.html
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added src/assets/fonts/ASCircularWeb-Bold.woff
View file
Open in desktop
Binary file not shown.
6 changes: 6 additions & 0 deletions src/fonts/themes/_alaska-classic.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
@include font-face($ds-basic-type-brand-family-primary, $ds-type-weight-light, 'ASCircularWeb-Light', $unicode-range-en);
Comment thread
sun-mota marked this conversation as resolved.
@include font-face($ds-basic-type-brand-family-primary, $ds-type-weight-book, 'ASCircularWeb-Book', $unicode-range-en);
@include font-face($ds-basic-type-brand-family-primary, $ds-type-weight-medium, 'ASCircularWeb-Medium', $unicode-range-en);
// bold, strong, and 700 weight will pick this up, b and strong tags will also pick this up
@include font-face($ds-basic-type-brand-family-primary, bold, 'ASCircularWeb-Bold', $unicode-range-en);
Comment thread
chrisfalaska marked this conversation as resolved.

// ---------------------------------------------------------------------
// i18n font remapping
Expand All @@ -23,6 +25,8 @@
@include font-face-i18n($ds-basic-type-brand-family-primary, $ds-type-weight-book, $i18n-font-jp-400-path, $unicode-range-jp);
// AS Circular 500 Medium -> Noto Sans JP 500
@include font-face-i18n($ds-basic-type-brand-family-primary, $ds-type-weight-medium, $i18n-font-jp-500-path, $unicode-range-jp);
// bold, strong, and 700 weight will pick this up, b and strong tags will also pick this up
@include font-face-i18n($ds-basic-type-brand-family-primary, bold, $i18n-font-jp-bold-path, $unicode-range-jp);

// Korean (KR)
// AS Circular 300 Light -> Noto Sans KR 300
Expand All @@ -31,4 +35,6 @@
@include font-face-i18n($ds-basic-type-brand-family-primary, $ds-type-weight-book, $i18n-font-kr-400-path, $unicode-range-kr);
// AS Circular 500 Medium -> Noto Sans KR 500
@include font-face-i18n($ds-basic-type-brand-family-primary, $ds-type-weight-medium, $i18n-font-kr-500-path, $unicode-range-kr);
// bold, strong, and 700 weight will pick this up, b and strong tags will also pick this up
@include font-face-i18n($ds-basic-type-brand-family-primary, bold, $i18n-font-kr-bold-path, $unicode-range-kr);
}
7 changes: 7 additions & 0 deletions src/fonts/themes/_alaska.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
// Alaska (AS) theme EN fonts
@include font-face($ds-basic-type-brand-family-primary, $ds-type-weight-light, 'ASCircularWeb-Light', $unicode-range-en);
@include font-face($ds-basic-type-brand-family-primary, $ds-type-weight-book, 'ASCircularWeb-Book', $unicode-range-en);
@include font-face($ds-basic-type-brand-family-primary, $ds-type-weight-medium, 'ASCircularWeb-Medium', $unicode-range-en);
// bold, strong, and 700 weight will pick this up, b and strong tags will also pick this up
@include font-face($ds-basic-type-brand-family-primary, bold, 'ASCircularWeb-Bold', $unicode-range-en);
@include font-face($ds-basic-type-brand-family-secondary, $ds-type-weight-cond-news, 'GoodOT-CondNews', $unicode-range-en);
@include font-face($ds-basic-type-brand-family-secondary, $ds-type-weight-cond-medium, 'GoodOT-CondMedium', $unicode-range-en);

Expand All @@ -24,6 +27,8 @@
@include font-face-i18n($ds-basic-type-brand-family-primary, $ds-type-weight-book, $i18n-font-jp-400-path, $unicode-range-jp);
// AS Circular 500 Medium -> Noto Sans JP 500
@include font-face-i18n($ds-basic-type-brand-family-primary, $ds-type-weight-medium, $i18n-font-jp-500-path, $unicode-range-jp);
// bold, strong, and 700 weight will pick this up, b and strong tags will also pick this up
@include font-face-i18n($ds-basic-type-brand-family-primary, bold, $i18n-font-jp-bold-path, $unicode-range-jp);
// Good OT 450 Cond News -> Noto Sans JP 400
@include font-face-i18n($ds-basic-type-brand-family-secondary, $ds-type-weight-cond-news, $i18n-font-jp-400-path, $unicode-range-jp);
// Good OT 500 Cond Medium -> Noto Sans JP 500
Expand All @@ -36,6 +41,8 @@
@include font-face-i18n($ds-basic-type-brand-family-primary, $ds-type-weight-book, $i18n-font-kr-400-path, $unicode-range-kr);
// AS Circular 500 Medium -> Noto Sans KR 500
@include font-face-i18n($ds-basic-type-brand-family-primary, $ds-type-weight-medium, $i18n-font-kr-500-path, $unicode-range-kr);
// bold, strong, and 700 weight will pick this up, b and strong tags will also pick this up
@include font-face-i18n($ds-basic-type-brand-family-primary, bold, $i18n-font-kr-bold-path, $unicode-range-kr);
// Good OT 450 Cond News -> Noto Sans KR 400
@include font-face-i18n($ds-basic-type-brand-family-secondary, $ds-type-weight-cond-news, $i18n-font-kr-400-path, $unicode-range-kr);
// Good OT 500 Cond Medium -> Noto Sans KR 500
Expand Down
6 changes: 6 additions & 0 deletions src/fonts/themes/_auro-1.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
@include font-face($ds-basic-type-brand-family-primary, $ds-type-weight-light, 'ASCircularWeb-Light', $unicode-range-en);
@include font-face($ds-basic-type-brand-family-primary, $ds-type-weight-book, 'ASCircularWeb-Book', $unicode-range-en);
@include font-face($ds-basic-type-brand-family-primary, $ds-type-weight-medium, 'ASCircularWeb-Medium', $unicode-range-en);
// bold, strong, and 700 weight will pick this up, b and strong tags will also pick this up
@include font-face($ds-basic-type-brand-family-primary, bold, 'ASCircularWeb-Bold', $unicode-range-en);
@include font-face($ds-basic-type-brand-family-secondary, $ds-type-weight-light, 'Teodor-Light', $unicode-range-en);

// ---------------------------------------------------------------------
Expand All @@ -24,6 +26,8 @@
@include font-face-i18n($ds-basic-type-brand-family-primary, $ds-type-weight-book, $i18n-font-jp-400-path, $unicode-range-jp);
// AS Circular 500 Medium -> Noto Sans JP 500
@include font-face-i18n($ds-basic-type-brand-family-primary, $ds-type-weight-medium, $i18n-font-jp-500-path, $unicode-range-jp);
// bold, strong, and 700 weight will pick this up, b and strong tags will also pick this up
@include font-face-i18n($ds-basic-type-brand-family-primary, bold, $i18n-font-jp-bold-path, $unicode-range-jp);
// Teodor 300 Light -> Noto Sans JP 300
@include font-face-i18n($ds-basic-type-brand-family-secondary, $ds-type-weight-light, $i18n-font-jp-300-path, $unicode-range-jp);

Expand All @@ -34,6 +38,8 @@
@include font-face-i18n($ds-basic-type-brand-family-primary, $ds-type-weight-book, $i18n-font-kr-400-path, $unicode-range-kr);
// AS Circular 500 Medium -> Noto Sans KR 500
@include font-face-i18n($ds-basic-type-brand-family-primary, $ds-type-weight-medium, $i18n-font-kr-500-path, $unicode-range-kr);
// bold, strong, and 700 weight will pick this up, b and strong tags will also pick this up
@include font-face-i18n($ds-basic-type-brand-family-primary, bold, $i18n-font-kr-bold-path, $unicode-range-kr);
// Teodor 300 Light -> Noto Sans KR 300
@include font-face-i18n($ds-basic-type-brand-family-secondary, $ds-type-weight-light, $i18n-font-kr-300-path, $unicode-range-kr);
}
2 changes: 2 additions & 0 deletions src/fonts/themes/_auro-2.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,6 @@

@include font-face($ds-basic-type-brand-family-primary, $ds-type-weight-book, 'ASCircularWeb-Book', $unicode-range-en);

// bold, strong, and 700 weight will pick this up, b and strong tags will also pick this up
@include font-face($ds-basic-type-brand-family-primary, bold, 'ASCircularWeb-Bold', $unicode-range-en);
@include font-face($ds-basic-type-brand-family-secondary, $ds-type-weight-light, 'Teodor-Light', $unicode-range-en);
6 changes: 6 additions & 0 deletions src/fonts/themes/_hawaiian.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
@include font-face($ds-basic-type-brand-family-secondary, $ds-type-weight-semibold, 'ChronicleDisplay-Semibold', $unicode-range-en);
@include font-face($ds-basic-type-brand-family-primary, $ds-type-weight-regular, 'SlatePro-Regular', $unicode-range-en);
@include font-face($ds-basic-type-brand-family-primary, $ds-type-weight-medium, 'SlatePro-Medium', $unicode-range-en);
// bold, strong, and 700 weight will pick this up, b and strong tags will also pick this up
@include font-face($ds-basic-type-brand-family-primary, bold, 'SlatePro-Bold', $unicode-range-en);

// ---------------------------------------------------------------------
// i18n font remapping
Expand All @@ -23,6 +25,8 @@
@include font-face-i18n($ds-basic-type-brand-family-primary, $ds-type-weight-regular, $i18n-font-jp-400-path, $unicode-range-jp);
// Slate Pro 500 -> Noto Sans JP 500
@include font-face-i18n($ds-basic-type-brand-family-primary, $ds-type-weight-medium, $i18n-font-jp-500-path, $unicode-range-jp);
// bold, strong, and 700 weight will pick this up, b and strong tags will also pick this up
@include font-face-i18n($ds-basic-type-brand-family-primary, bold, $i18n-font-jp-bold-path, $unicode-range-jp);

// Korean (KR)
// Chronicle Display 600 -> Noto Sans KR 600
Expand All @@ -31,4 +35,6 @@
@include font-face-i18n($ds-basic-type-brand-family-primary, $ds-type-weight-regular, $i18n-font-kr-400-path, $unicode-range-kr);
// Slate Pro 500 -> Noto Sans KR 500
@include font-face-i18n($ds-basic-type-brand-family-primary, $ds-type-weight-medium, $i18n-font-kr-500-path, $unicode-range-kr);
// bold, strong, and 700 weight will pick this up, b and strong tags will also pick this up
@include font-face-i18n($ds-basic-type-brand-family-primary, bold, $i18n-font-kr-bold-path, $unicode-range-kr);
}
6 changes: 5 additions & 1 deletion src/utilityVariables/_fontUtils.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ $unicode-range-kr: U+1100-11FF, U+3130-318F, U+AC00-D7AF !default;
$i18n-font-host: "https://resource.alaskaair.net" !default;

// Per-locale base paths
$i18n-font-base-path-en: "#{$i18n-font-host}/en-us/assets/font" !default;
// default font path is from global (routing using flastly's Global_Asset_Mappings.vcl)
$i18n-font-base-path-en: "#{$i18n-font-host}/assets/font/global" !default;
// other locale font paths are from the locale-specific subdirectories (routing using flastly's CMS_Content.vcl.vcl, en-US path will be deprecated in the future)
$i18n-font-base-path-jp: "#{$i18n-font-host}/ja-jp/assets/font" !default;
$i18n-font-base-path-kr: "#{$i18n-font-host}/ko-kr/assets/font" !default;
$i18n-font-base-path-sc: "#{$i18n-font-host}/zh-sc/assets/font" !default;
Expand All @@ -35,12 +37,14 @@ $i18n-font-jp-300-path: "#{$i18n-font-base-path-jp}/noto-sans-jp-v54-japanese-30
$i18n-font-jp-400-path: "#{$i18n-font-base-path-jp}/noto-sans-jp-v54-japanese-400" !default;
$i18n-font-jp-500-path: "#{$i18n-font-base-path-jp}/noto-sans-jp-v54-japanese-500" !default;
$i18n-font-jp-600-path: "#{$i18n-font-base-path-jp}/noto-sans-jp-v55-japanese-600" !default;
$i18n-font-jp-bold-path: "#{$i18n-font-base-path-jp}/noto-sans-jp-v55-japanese-700" !default;

// Korean
$i18n-font-kr-300-path: "#{$i18n-font-base-path-kr}/noto-sans-kr-v38-korean-300" !default;
$i18n-font-kr-400-path: "#{$i18n-font-base-path-kr}/noto-sans-kr-v38-korean-400" !default;
$i18n-font-kr-500-path: "#{$i18n-font-base-path-kr}/noto-sans-kr-v38-korean-500" !default;
$i18n-font-kr-600-path: "#{$i18n-font-base-path-kr}/noto-sans-kr-v38-korean-600" !default;
$i18n-font-kr-bold-path: "#{$i18n-font-base-path-kr}/noto-sans-kr-v38-korean-700" !default;

// Chinese Simplified
$i18n-font-sc-300-path: "#{$i18n-font-base-path-sc}/noto-sans-sc-v38-chinese-simplified-300" !default;
Expand Down
Loading