zhao/heti
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

中英文混排之时，中文字符之间有字间距，英文字符之间没有字间距。

Browse source
This commit is contained in:
xiaolai 2022-12-09 00:11:17 +08:00
parent 35c2634a3a
commit af637c7a6d
3 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
_site/heti.css
View file

@ -131,7 +131,7 @@
src: local("Source Han Sans KR Heavy"), local("Noto Sans CJK KR Heavy"); 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-family: "Heti Hei SC Black Fallback";
font-weight: 800; font-weight: 800;
src: local("Microsoft YaHei"), local("Droid Sans Fallback"); src: local("Microsoft YaHei"), local("Droid Sans Fallback");
@ -204,6 +204,7 @@ font-face {
overflow-wrap: break-word; overflow-wrap: break-word;
word-wrap: break-word; word-wrap: break-word;
hyphens: auto; hyphens: auto;
letter-spacing: 0.02em;
} }
.heti::before, .heti::after { .heti::before, .heti::after {
@ -215,6 +216,10 @@ font-face {
clear: both; clear: both;
} }
.heti:not(:lang(zh)):not(:lang(ja)):not(:lang(kr)), .heti:not(:lang(zh)) {
letter-spacing: 0;
}
.heti > *:first-child, .heti > *:first-child,
.heti section > *:first-child, .heti section > *:first-child,
.heti td > *:first-child { .heti td > *:first-child {

7
lib/_base.scss
View file

@ -6,6 +6,13 @@
// 清容器浮动 // 清容器浮动
@include clear-float(); @include clear-float();
// 非中文时不加间距
letter-spacing: $letter-spacing-medium;
@include non-cjk-block {
letter-spacing: $letter-spacing-normal;
}
// 清容器内首尾元素外边距 // 清容器内首尾元素外边距
&, &,
section, section,

6
lib/_variables.scss
View file

@ -54,6 +54,12 @@ $line-height-expanded-ultra: 2.25 !default;
//$line-height-condensed: 1.25 !default; //$line-height-condensed: 1.25 !default;
//$line-height-condensed-ultra: 1 !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-normal: $font-size-normal * $line-height-normal !default;
$line-height-size-large: $line-height-size-normal !default; $line-height-size-large: $line-height-size-normal !default;
$line-height-size-x-large: $font-size-x-large * $line-height-normal !default; $line-height-size-x-large: $font-size-x-large * $line-height-normal !default;