diff --git a/_site/heti.css b/_site/heti.css index 83be8eb..09aced6 100644 --- a/_site/heti.css +++ b/_site/heti.css @@ -35,7 +35,7 @@ @font-face { font-family: "Heti Song"; font-weight: 200; - src: local("Songti SC Light"), local("Songti TC Light"), local(STSong), local("SimSun"); + src: local("Songti SC Light"), local("Songti TC Light"), local("STSong"), local("SimSun"); } @font-face { @@ -173,7 +173,7 @@ padding-inline-start: 16px; padding-inline-end: 16px; overflow: auto; - font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; + font-family: "SFMono-Regular", consolas, "Liberation Mono", menlo, courier, monospace, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; white-space: pre; word-wrap: normal; border-radius: 4px; @@ -389,7 +389,7 @@ .heti code { margin-inline-start: 0.25em; margin-inline-end: 0.25em; - font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; + font-family: "SFMono-Regular", consolas, "Liberation Mono", menlo, courier, monospace, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; font-size: 0.875em; } @@ -472,7 +472,7 @@ margin-inline-start: 0.25em; margin-inline-end: 0.25em; font-size: 0.75em; - font-family: "Helvetica Neue", Helvetica, Arial, "Heti Hei", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; + font-family: "Helvetica Neue", helvetica, arial, "Heti Hei", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; font-style: normal; line-height: 1; vertical-align: baseline; @@ -561,15 +561,15 @@ } .heti, .heti--sans { - font-family: "Helvetica Neue", Helvetica, Arial, "Heti Hei", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; + font-family: "Helvetica Neue", helvetica, arial, "Heti Hei", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; } .heti--serif { - font-family: "Times New Roman", Times, "Heti Song", serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; + font-family: "Times New Roman", times, "Heti Song", serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; } .heti--classic { - font-family: "Times New Roman", Times, "Heti Song", serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; + font-family: "Times New Roman", times, "Heti Song", serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; } .heti--classic h1, @@ -578,33 +578,32 @@ .heti--classic h4, .heti--classic h5, .heti--classic h6 { - font-family: "Times New Roman", Times, "Heti Kai Black", serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; + font-family: "Times New Roman", times, "Heti Kai Black", serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; font-weight: 800; } .heti--classic blockquote, .heti--classic cite, .heti--classic q { - font-family: "Times New Roman", Times, "Heti Kai", serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; + font-family: "Times New Roman", times, "Heti Kai", serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; } -.heti--classic em, .heti--classic figcaption, .heti--classic caption, .heti--classic th { - font-family: "Helvetica Neue", Helvetica, Arial, "Heti Hei", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; + font-family: "Helvetica Neue", helvetica, arial, "Heti Hei", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; } .heti--hei { - font-family: "Helvetica Neue", Helvetica, Arial, "Heti Hei", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; + font-family: "Helvetica Neue", helvetica, arial, "Heti Hei", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; } .heti--song { - font-family: "Times New Roman", Times, "Heti Song", serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; + font-family: "Times New Roman", times, "Heti Song", serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; } .heti--kai { - font-family: "Times New Roman", Times, "Heti Kai", serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; + font-family: "Times New Roman", times, "Heti Kai", serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; } .heti--columns-1, .heti--columns-2, .heti--columns-3, .heti--columns-4, .heti--columns-16em, .heti--columns-20em, .heti--columns-24em, .heti--columns-28em, .heti--columns-32em, .heti--columns-36em, .heti--columns-40em, .heti--columns-44em, .heti--columns-48em, .heti comma { @@ -687,7 +686,7 @@ } .heti--ancient, .heti--poetry { - font-family: "Times New Roman", Times, "Heti Song", serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; + font-family: "Times New Roman", times, "Heti Song", serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; } .heti--ancient h1, @@ -701,7 +700,7 @@ .heti--poetry h4, .heti--poetry h5, .heti--poetry h6 { - font-family: "Times New Roman", Times, "Heti Kai Black", serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; + font-family: "Times New Roman", times, "Heti Kai Black", serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; font-weight: 800; text-align: center; } @@ -838,7 +837,7 @@ border-block-start: 1px solid; border-block-start-color: #cccccc; font-size: 14px; - font-family: "Helvetica Neue", Helvetica, Arial, "Heti Hei", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; + font-family: "Helvetica Neue", helvetica, arial, "Heti Hei", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; line-height: 24px; } diff --git a/lib/_variables.scss b/lib/_variables.scss index fc568df..fcce073 100644 --- a/lib/_variables.scss +++ b/lib/_variables.scss @@ -9,9 +9,9 @@ $manualmode-dark-selector: '[data-darkmode="dark"] &' !default; // 字体 Fonts // 字体栈 Font Stacks -$_font-stack-sans: "Helvetica Neue", Helvetica, Arial !default; -$_font-stack-serif: "Times New Roman", Times !default; -$_font-stack-mono: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier !default; +$_font-stack-sans: "Helvetica Neue", helvetica, arial !default; +$_font-stack-serif: "Times New Roman", times !default; +$_font-stack-mono: "SFMono-Regular", consolas, "Liberation Mono", menlo, courier !default; $_font-stack-symbol: "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !default; // 字体族 Font Families diff --git a/lib/fonts/_song.scss b/lib/fonts/_song.scss index b5b8f3b..5276737 100644 --- a/lib/fonts/_song.scss +++ b/lib/fonts/_song.scss @@ -17,7 +17,7 @@ src: local("Songti SC Light"), local("Songti TC Light"), - local(STSong), + local("STSong"), local("SimSun"); } diff --git a/lib/modifiers/font-stack.scss b/lib/modifiers/font-stack.scss index c6d3936..5a47483 100644 --- a/lib/modifiers/font-stack.scss +++ b/lib/modifiers/font-stack.scss @@ -16,6 +16,8 @@ } // 定义传统字体 + // 「传统字体」仅供设计参考。主旨为标题用楷体,正文用宋体,表头等客观指标描述场合用黑体。 + // 由于渲染机制等原因,应尽量避免衬线、非衬线字体混排,会引起行高不一致的bug。 &--classic { // 正文使用宋体 font-family: $font-family-song; @@ -38,8 +40,7 @@ font-family: $font-family-kai; } - // 强调、说明文字、表头使用黑体 - em, + // 说明文字、表头等反应客观指标、事物的位置使用黑体 figcaption, caption, th {