diff --git a/assets/scss/_core/_font.scss b/assets/scss/_core/_font.scss index d80be00..b258857 100644 --- a/assets/scss/_core/_font.scss +++ b/assets/scss/_core/_font.scss @@ -7,7 +7,41 @@ } @font-face { - font-family: 'fw'; - src: url('/lib/fonts/fw.svg') format('svg'); + font-family: 'Noto Sans CJK SC'; + src: url('/lib/fonts/NotoSansCJKsc-Regular.woff2') format('woff2'); + font-weight: 400; + font-style: normal; + font-display: swap; +} + +@font-face { + font-family: 'Noto Sans CJK TC'; + src: url('/lib/fonts/NotoSansCJKtc-Regular.woff2') format('woff2'); + font-weight: 400; + font-style: normal; + font-display: swap; +} + +@font-face { + font-family: 'Noto Sans CJK JP'; + src: url('/lib/fonts/NotoSansCJKjp-Regular.woff2') format('woff2'); + font-weight: 400; + font-style: normal; + font-display: swap; +} + +@font-face { + font-family: 'Noto Sans CJK KR'; + src: url('/lib/fonts/NotoSansCJKkr-Regular.woff2') format('woff2'); + font-weight: 400; + font-style: normal; + font-display: swap; +} + +@font-face { + font-family: 'Noto Sans'; + src: url('/lib/fonts/NotoSans-Regular.woff2') format('woff2'); + font-weight: 400; + font-style: normal; font-display: swap; } diff --git a/assets/scss/_core/_typography.scss b/assets/scss/_core/_typography.scss index 3988ab4..bed33ff 100644 --- a/assets/scss/_core/_typography.scss +++ b/assets/scss/_core/_typography.scss @@ -3,10 +3,10 @@ body { line-height: 1.2; font-size: 16px; - font-family: 'Geist', helvetica, arial, sans-serif; + font-family: sans-serif; button { - font-family: 'fw', sans-serif; + font-family: 'Noto Sans', sans-serif; } @include min-width('tablet') { @@ -16,3 +16,23 @@ body { font-size: 19px; } } + +body:lang(en) { + font-family: 'Geist', sans-serif; +} + +body:lang(zh-cn, zh-sg) { + font-family: 'Noto Sans', 'Noto Sans CJK SC', sans-serif; +} + +body:lang(zh-hk, zh-mo, zh-tw) { + font-family: 'Noto Sans', 'Noto Sans CJK TC', sans-serif; +} + +body:lang(ja) { + font-family: 'Noto Sans', 'Noto Sans CJK JP', sans-serif; +} + +body:lang(ko) { + font-family: 'Noto Sans', 'Noto Sans CJK KR', sans-serif; +} diff --git a/static/lib/fonts/NotoSans-Regular.woff2 b/static/lib/fonts/NotoSans-Regular.woff2 new file mode 100644 index 0000000..7e1323e Binary files /dev/null and b/static/lib/fonts/NotoSans-Regular.woff2 differ diff --git a/static/lib/fonts/NotoSansCJKjp-Regular.woff2 b/static/lib/fonts/NotoSansCJKjp-Regular.woff2 new file mode 100644 index 0000000..b80b676 Binary files /dev/null and b/static/lib/fonts/NotoSansCJKjp-Regular.woff2 differ diff --git a/static/lib/fonts/NotoSansCJKkr-Regular.woff2 b/static/lib/fonts/NotoSansCJKkr-Regular.woff2 new file mode 100644 index 0000000..8805b66 Binary files /dev/null and b/static/lib/fonts/NotoSansCJKkr-Regular.woff2 differ diff --git a/static/lib/fonts/NotoSansCJKsc-Regular.woff2 b/static/lib/fonts/NotoSansCJKsc-Regular.woff2 new file mode 100644 index 0000000..05a6a1b Binary files /dev/null and b/static/lib/fonts/NotoSansCJKsc-Regular.woff2 differ diff --git a/static/lib/fonts/NotoSansCJKtc-Regular.woff2 b/static/lib/fonts/NotoSansCJKtc-Regular.woff2 new file mode 100644 index 0000000..712228f Binary files /dev/null and b/static/lib/fonts/NotoSansCJKtc-Regular.woff2 differ diff --git a/static/lib/fonts/fw.svg b/static/lib/fonts/fw.svg deleted file mode 100644 index b818214..0000000 --- a/static/lib/fonts/fw.svg +++ /dev/null @@ -1,28 +0,0 @@ - - - - -Created by FontForge 20200511 at Wed Jul 18 11:35:56 2007 - By convertio -(c) 2006 Microsoft Corporation. All Rights Reserved. - - - - - - - -