Summary Files Commits Branches @commit @diff @stats
path: root / src
diff options
context:
space:
mode:
Commitf2d4a623c4c8610db195778ebccca5d62176b9cc (patch)
Author
 Yan Zhu <picturepan2@hotmail.com>
2018-06-10 09:10:37 +0800
Committer
 GitHub <noreply@github.com>
2018-06-10 09:10:37 +0800
Files12fcb31b3a7ed0806177757a6e0fd7c2c92519a2 /src
Spectre-Dark-Gruvbox-f2d4a623c4c8610db195778ebccca5d62176b9cc.tar
Spectre-Dark-Gruvbox-f2d4a623c4c8610db195778ebccca5d62176b9cc.tar.gz
Spectre-Dark-Gruvbox-f2d4a623c4c8610db195778ebccca5d62176b9cc.zip
Parent1863bca6d2718c777ac8fa2a0440da7b006d32b9 (diff)
Parent578fe318a18016f976fb20ad7d82d7bce3a0e02b (diff)
Merge pull request #440 from Raymonf/zh-separation
Separate Simplified Chinese (zh/zh-Hans) from Traditional (zh-Hant)
2 files changed, 11 insertions, 3 deletions
-rw-r--r--src/_asian.scss11
-rw-r--r--src/_variables.scss3
diff --git a/src/_asian.scss b/src/_asian.scss
index 5f7533e..b27d969 100644
--- a/src/_asian.scss
+++ b/src/_asian.scss
@@ -1,6 +1,11 @@
// Optimized for East Asian CJK
-:lang(zh) {
- font-family: $cjk-zh-font-family;
+:lang(zh),
+:lang(zh-Hans) {
+ font-family: $cjk-zh-hans-font-family;
+}
+
+:lang(zh-Hant) {
+ font-family: $cjk-zh-hant-font-family;
}
:lang(ja) {
@@ -12,6 +17,8 @@
}
:lang(zh),
+:lang(zh-Hans),
+:lang(zh-Hant),
:lang(ja),
.cjk {
ins,
diff --git a/src/_variables.scss b/src/_variables.scss
index b2b6c47..1162aab 100644
--- a/src/_variables.scss
+++ b/src/_variables.scss
@@ -44,7 +44,8 @@ $link-color-light: lighten($link-color, 10%) !default;
$base-font-family: -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto !default;
$mono-font-family: "SF Mono", "Segoe UI Mono", "Roboto Mono", Menlo, Courier, monospace !default;
$fallback-font-family: "Helvetica Neue", sans-serif !default;
-$cjk-zh-font-family: $base-font-family, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", $fallback-font-family !default;
+$cjk-zh-hans-font-family: $base-font-family, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", $fallback-font-family !default;
+$cjk-zh-hant-font-family: $base-font-family, "PingFang TC", "Hiragino Sans CNS", "Microsoft JhengHei", $fallback-font-family !default;
$cjk-jp-font-family: $base-font-family, "Hiragino Sans", "Hiragino Kaku Gothic Pro", "Yu Gothic", YuGothic, Meiryo, $fallback-font-family !default;
$cjk-ko-font-family: $base-font-family, "Malgun Gothic", $fallback-font-family !default;
$body-font-family: $base-font-family, $fallback-font-family !default;