From af637c7a6df3bb5a5d43d767339530640b940e8e Mon Sep 17 00:00:00 2001 From: xiaolai Date: Fri, 9 Dec 2022 00:11:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E8=8B=B1=E6=96=87=E6=B7=B7=E6=8E=92?= =?UTF-8?q?=E4=B9=8B=E6=97=B6=EF=BC=8C=E4=B8=AD=E6=96=87=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E4=B9=8B=E9=97=B4=E6=9C=89=E5=AD=97=E9=97=B4=E8=B7=9D=EF=BC=8C?= =?UTF-8?q?=E8=8B=B1=E6=96=87=E5=AD=97=E7=AC=A6=E4=B9=8B=E9=97=B4=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=AD=97=E9=97=B4=E8=B7=9D=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _site/heti.css | 7 ++++++- lib/_base.scss | 7 +++++++ lib/_variables.scss | 6 ++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/_site/heti.css b/_site/heti.css index d8727b8..f13afed 100644 --- a/_site/heti.css +++ b/_site/heti.css @@ -131,7 +131,7 @@ src: local("Source Han Sans KR Heavy"), local("Noto Sans CJK KR Heavy"); } -font-face { +@font-face { font-family: "Heti Hei SC Black Fallback"; font-weight: 800; src: local("Microsoft YaHei"), local("Droid Sans Fallback"); @@ -204,6 +204,7 @@ font-face { overflow-wrap: break-word; word-wrap: break-word; hyphens: auto; + letter-spacing: 0.02em; } .heti::before, .heti::after { @@ -215,6 +216,10 @@ font-face { clear: both; } +.heti:not(:lang(zh)):not(:lang(ja)):not(:lang(kr)), .heti:not(:lang(zh)) { + letter-spacing: 0; +} + .heti > *:first-child, .heti section > *:first-child, .heti td > *:first-child { diff --git a/lib/_base.scss b/lib/_base.scss index 3fe91d0..ff8e979 100644 --- a/lib/_base.scss +++ b/lib/_base.scss @@ -6,6 +6,13 @@ // 清容器浮动 @include clear-float(); + // 非中文时不加间距 + letter-spacing: $letter-spacing-medium; + @include non-cjk-block { + letter-spacing: $letter-spacing-normal; + + } + // 清容器内首尾元素外边距 &, section, diff --git a/lib/_variables.scss b/lib/_variables.scss index 507d77e..fe086c6 100644 --- a/lib/_variables.scss +++ b/lib/_variables.scss @@ -54,6 +54,12 @@ $line-height-expanded-ultra: 2.25 !default; //$line-height-condensed: 1.25 !default; //$line-height-condensed-ultra: 1 !default; +// 字符间距 +$letter-spacing-normal: 0 !default; +$letter-spacing-small: 0.01em !default; +$letter-spacing-medium: 0.02em !default; +$letter-spacing-large: 0.05em !default; + $line-height-size-normal: $font-size-normal * $line-height-normal !default; $line-height-size-large: $line-height-size-normal !default; $line-height-size-x-large: $font-size-x-large * $line-height-normal !default;