Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
82 changes: 41 additions & 41 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
"@figma/code-connect": "^1.4.3",
"@percy/cli": "^1.31.0",
"@percy/storybook": "^9.1.0",
"@skyscanner/bpk-foundations-web": "^24.4.0",
"@skyscanner/bpk-foundations-web": "^24.4.1",
"@skyscanner/bpk-svgs": "^20.11.0",
"@skyscanner/eslint-config-skyscanner": "^22.6.0",
"@skyscanner/stylelint-config-skyscanner": "^14.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/bpk-stylesheets/base.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

81 changes: 80 additions & 1 deletion packages/bpk-stylesheets/font.scss
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,10 @@ $bpk-fonts: (
}
}

// Language-specific font stacks applied to any element whose `lang` matches
// the given locale. Each stack prefers the locale's primary Noto Sans face,
// then related CJK and other non-Latin Noto families as fallbacks, then system fonts.

[lang='ja-JP'],
:lang(ja-JP) {
--bpk-base-font-stack:
Expand All @@ -437,7 +441,9 @@ $bpk-fonts: (
}

[lang='zh-TW'],
:lang(zh-TW) {
:lang(zh-TW),
[lang='zh-HK'],
:lang(zh-HK) {
--bpk-base-font-stack:
'Skyscanner Relative', 'Noto Sans TC', 'Noto Sans SC', 'Noto Sans JP',
'Noto Sans KR', 'Noto Sans Arabic', 'Noto Sans Hebrew', 'Noto Sans',
Comment thread
xiaogliu marked this conversation as resolved.
Expand All @@ -446,6 +452,79 @@ $bpk-fonts: (
'Helvetica Neue', sans-serif;
}

[lang='zh-CN'],
:lang(zh-CN) {
--bpk-base-font-stack:
'Skyscanner Relative', 'Noto Sans SC', 'Noto Sans TC', 'Noto Sans JP',
'Noto Sans KR', 'Noto Sans Arabic', 'Noto Sans Hebrew', 'Noto Sans',
'Noto Sans Devanagari', 'Noto Sans Thai', -apple-system, blinkmacsystemfont,
roboto, oxygen, ubuntu, cantarell, 'Fira Sans', 'Droid Sans',
'Helvetica Neue', sans-serif;
}

[lang='ko-KR'],
:lang(ko-KR) {
--bpk-base-font-stack:
'Skyscanner Relative', 'Noto Sans KR', 'Noto Sans JP', 'Noto Sans SC',
'Noto Sans TC', 'Noto Sans Arabic', 'Noto Sans Hebrew', 'Noto Sans',
'Noto Sans Devanagari', 'Noto Sans Thai', -apple-system, blinkmacsystemfont,
roboto, oxygen, ubuntu, cantarell, 'Fira Sans', 'Droid Sans',
'Helvetica Neue', sans-serif;
}

[lang='th-TH'],
:lang(th-TH) {
--bpk-base-font-stack:
'Skyscanner Relative', 'Noto Sans Thai', 'Noto Sans Arabic',
'Noto Sans Hebrew', 'Noto Sans', 'Noto Sans Devanagari', -apple-system,
blinkmacsystemfont, roboto, oxygen, ubuntu, cantarell, 'Fira Sans',
'Droid Sans', 'Helvetica Neue', sans-serif;
}

[lang='hi-IN'],
:lang(hi-IN) {
--bpk-base-font-stack:
'Skyscanner Relative', 'Noto Sans Devanagari', 'Noto Sans Arabic',
'Noto Sans Hebrew', 'Noto Sans', 'Noto Sans Thai', -apple-system,
blinkmacsystemfont, roboto, oxygen, ubuntu, cantarell, 'Fira Sans',
'Droid Sans', 'Helvetica Neue', sans-serif;
}

[lang='ar'],
:lang(ar) {
--bpk-base-font-stack:
'Skyscanner Relative', 'Noto Sans Arabic', 'Noto Sans Hebrew', 'Noto Sans',
'Noto Sans Devanagari', 'Noto Sans Thai', -apple-system, blinkmacsystemfont,
roboto, oxygen, ubuntu, cantarell, 'Fira Sans', 'Droid Sans',
'Helvetica Neue', sans-serif;
}

[lang='he'],
:lang(he) {
--bpk-base-font-stack:
'Skyscanner Relative', 'Noto Sans Hebrew', 'Noto Sans Arabic', 'Noto Sans',
'Noto Sans Devanagari', 'Noto Sans Thai', -apple-system, blinkmacsystemfont,
roboto, oxygen, ubuntu, cantarell, 'Fira Sans', 'Droid Sans',
'Helvetica Neue', sans-serif;
}

[lang='el-GR'],
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems all font setting of 'el-GR' ru-RU vi-VN are same, are they expected? if so, could we merged them?

:lang(el-GR),
[lang='ru-RU'],
:lang(ru-RU),
[lang='uk-UA'],
:lang(uk-UA),
[lang='bg-BG'],
:lang(bg-BG),
[lang='vi-VN'],
:lang(vi-VN) {
--bpk-base-font-stack:
'Skyscanner Relative', 'Noto Sans', 'Noto Sans Arabic', 'Noto Sans Hebrew',
'Noto Sans Devanagari', 'Noto Sans Thai', -apple-system, blinkmacsystemfont,
roboto, oxygen, ubuntu, cantarell, 'Fira Sans', 'Droid Sans',
'Helvetica Neue', sans-serif;
}

// Using :where([lang]) ensures that we trigger a re-evaluation of the font-stack
// variable for any element with a lang attribute, but with ZERO specificity.
// This means any component with its own class (like BpkBubble or Editorial text)
Expand Down
Loading
Loading