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

Merge pull request #57 from sivan/develop

Browse source 
fix: add quote and fix line-height issue
This commit is contained in:
Sivan 2021-08-12 18:49:33 +08:00 committed by GitHub
commit 2957435a77
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 812 additions and 576 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/deploy.yml vendored
View file

@ -16,7 +16,7 @@ jobs:
- name: Setup Node.js - name: Setup Node.js
uses: actions/setup-node@v1 uses: actions/setup-node@v1
with: with:
node-version: 10 node-version: 14
- name: NPM Install and Test - name: NPM Install and Test
run: | run: |
npm install npm install

2
.github/workflows/nodejs.yml vendored
View file

@ -11,7 +11,7 @@ jobs:
strategy: strategy:
matrix: matrix:
node-version: [10.x, 12.x] node-version: [12.x, 14.x]
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1

33
_site/heti.css
View file

@ -35,7 +35,7 @@
@font-face { @font-face {
font-family: "Heti Song"; font-family: "Heti Song";
font-weight: 200; 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 { @font-face {
@ -173,7 +173,7 @@
padding-inline-start: 16px; padding-inline-start: 16px;
padding-inline-end: 16px; padding-inline-end: 16px;
overflow: auto; 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; white-space: pre;
word-wrap: normal; word-wrap: normal;
border-radius: 4px; border-radius: 4px;
@ -389,7 +389,7 @@
.heti code { .heti code {
margin-inline-start: 0.25em; margin-inline-start: 0.25em;
margin-inline-end: 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; font-size: 0.875em;
} }
@ -472,7 +472,7 @@
margin-inline-start: 0.25em; margin-inline-start: 0.25em;
margin-inline-end: 0.25em; margin-inline-end: 0.25em;
font-size: 0.75em; 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; font-style: normal;
line-height: 1; line-height: 1;
vertical-align: baseline; vertical-align: baseline;
@ -561,15 +561,15 @@
} }
.heti, .heti--sans { .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 { .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 { .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, .heti--classic h1,
@ -578,33 +578,32 @@
.heti--classic h4, .heti--classic h4,
.heti--classic h5, .heti--classic h5,
.heti--classic h6 { .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; font-weight: 800;
} }
.heti--classic blockquote, .heti--classic blockquote,
.heti--classic cite, .heti--classic cite,
.heti--classic q { .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 figcaption,
.heti--classic caption, .heti--classic caption,
.heti--classic th { .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 { .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 { .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 { .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 { .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 { .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, .heti--ancient h1,
@ -701,7 +700,7 @@
.heti--poetry h4, .heti--poetry h4,
.heti--poetry h5, .heti--poetry h5,
.heti--poetry h6 { .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; font-weight: 800;
text-align: center; text-align: center;
} }
@ -838,7 +837,7 @@
border-block-start: 1px solid; border-block-start: 1px solid;
border-block-start-color: #cccccc; border-block-start-color: #cccccc;
font-size: 14px; 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; line-height: 24px;
} }

6
lib/_variables.scss
View file

@ -9,9 +9,9 @@ $manualmode-dark-selector: '[data-darkmode="dark"] &' !default;
// 字体 Fonts // 字体 Fonts
// 字体栈 Font Stacks // 字体栈 Font Stacks
$_font-stack-sans: "Helvetica Neue", Helvetica, Arial !default; $_font-stack-sans: "Helvetica Neue", helvetica, arial !default;
$_font-stack-serif: "Times New Roman", Times !default; $_font-stack-serif: "Times New Roman", times !default;
$_font-stack-mono: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier !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-stack-symbol: "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !default;
// 字体族 Font Families // 字体族 Font Families

2
lib/fonts/_song.scss
View file

@ -17,7 +17,7 @@
src: src:
local("Songti SC Light"), local("Songti SC Light"),
local("Songti TC Light"), local("Songti TC Light"),
local(STSong), local("STSong"),
local("SimSun"); local("SimSun");
} }

5
lib/modifiers/font-stack.scss
View file

@ -16,6 +16,8 @@
} }
// 定义传统字体 // 定义传统字体
// 「传统字体」仅供设计参考。主旨为标题用楷体，正文用宋体，表头等客观指标描述场合用黑体。
// 由于渲染机制等原因，应尽量避免衬线、非衬线字体混排，会引起行高不一致的bug。
&--classic { &--classic {
// 正文使用宋体 // 正文使用宋体
font-family: $font-family-song; font-family: $font-family-song;
@ -38,8 +40,7 @@
font-family: $font-family-kai; font-family: $font-family-kai;
} }
// 强调、说明文字、表头使用黑体 // 说明文字、表头等反应客观指标、事物的位置使用黑体
em,
figcaption, figcaption,
caption, caption,
th { th {

1328
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

10
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "heti", "name": "heti",
"version": "0.8.1", "version": "0.8.2",
"description": "赫蹏是专为中文内容展示设计的排版样式增强。它基于通行的中文排版规范而来，可以为网站的读者带来更好的文章阅读体验。", "description": "赫蹏是专为中文内容展示设计的排版样式增强。它基于通行的中文排版规范而来，可以为网站的读者带来更好的文章阅读体验。",
"main": "lib/heti.scss", "main": "lib/heti.scss",
"files": [ "files": [
@ -43,10 +43,10 @@
"node-sass": "^4.14.1", "node-sass": "^4.14.1",
"rollup": "^1.32.1", "rollup": "^1.32.1",
"rollup-plugin-terser": "^5.3.1", "rollup-plugin-terser": "^5.3.1",
"stylelint": "^13.7.2", "stylelint": "^13.13.1",
"stylelint-config-recommended-scss": "^4.2.0", "stylelint-config-recommended-scss": "^4.3.0",
"stylelint-config-standard": "^19.0.0", "stylelint-config-standard": "^22.0.0",
"stylelint-scss": "^3.18.0" "stylelint-scss": "^3.20.1"
}, },
"stylelint": { "stylelint": {
"extends": [ "extends": [