diff options
| author | Dillon <dillonzq@outlook.com> | 2020-04-15 14:09:54 +0300 |
|---|---|---|
| committer | Dillon <dillonzq@outlook.com> | 2020-04-15 14:09:54 +0300 |
| commit | 6dcb8ce338d98cb844cf868b0719e712cd6984f3 (patch) | |
| tree | 4cd22de57356215bc201a9e6d8230fcbc86c036a /assets | |
| parent | ea7b9beaa3884a5f4cc501cac0b997e23c9b4282 (diff) | |
| parent | ee85eb12e1e949188f2cee5080737f5f3a4619ed (diff) | |
Merge branch 'master' into develop
# Conflicts:
# assets/css/_variables.scss
# package-lock.json
# package.json
Diffstat (limited to 'assets')
| -rw-r--r-- | assets/css/_variables.scss | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/assets/css/_variables.scss b/assets/css/_variables.scss index 2049aa2..901c520 100644 --- a/assets/css/_variables.scss +++ b/assets/css/_variables.scss @@ -4,7 +4,7 @@ // ========== Global ========== // // Font and Line Height -$global-font-family: system, -apple-system, BlinkMacSystemFont, "PingFang SC", "Segoe UI", "Microsoft YaHei", "wenquanyi micro hei","Hiragino Sans GB", "Hiragino Sans GB W3", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", Helvetica, Arial, sans-serif !default; +$global-font-family: system, -apple-system, BlinkMacSystemFont, PingFang SC, Microsoft YaHei UI, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, Helvetica, Arial, sans-serif !default; $global-font-size: 16px; $global-font-weight: 400; $global-line-height: 1.5rem; |