diff --git a/assets/sass/abstracts/_variables.scss b/assets/sass/abstracts/_variables.scss index 5aef0137..a85f519a 100644 --- a/assets/sass/abstracts/_variables.scss +++ b/assets/sass/abstracts/_variables.scss @@ -1,10 +1,10 @@ @import "../themes/theme"; -$text-font-stack: /*'Muli', Georgia, -apple-system, */ "Noto Sans", - "Noto Sans CJK", "Source Han Sans" "PingFang SC", "Hiragino Sans GB", - "Microsoft Yahei", "Microsoft JhengHei", "ST Heiti", "Noto Sans Thai", - sans-serif !default; -$code-font-stack: Consolas, Monaco, Menlo, "Noto Sans Mono", "DejaVu Sans Mono", +$text-font-stack: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", + Arial, "Noto Sans", "Liberation Sans", sans-serif, "Apple Color Emoji", + "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; + +$code-font-stack: Consolas, Monaco, Menlo, "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Courier New", "Lucida Console", "Lucida Sans Typewriter", "Liberation Mono", "Nimbus Mono L", Monaco, Courier, monospace !default; diff --git a/assets/sass/base/_typography.scss b/assets/sass/base/_typography.scss new file mode 100644 index 00000000..88518a8a --- /dev/null +++ b/assets/sass/base/_typography.scss @@ -0,0 +1,83 @@ +/** + * Basic typography style for copy text + */ + +@import url("https://fonts.googleapis.com/css2?family=Noto+Sans&family=Noto+Sans+SC&family=Noto+Sans+JP&family=IBM+Plex+Sans+Thai+Looped"); + +@font-face { + font-family: LXGWClearGothic; + src: url("../fonts/LXGWClearGothic-Regular.ttf"); +} + +body { + font-size: 1rem; + font-family: "Noto Sans", "Helvetica Neue", Helvetica, Arial, + "IBM Plex Sans Thai Looped", $text-font-stack; +} + +[lang="zh-cn"] body { + font-family: "Noto Sans SC", "Hiragino Sans GB", "华文细黑", "STHeiti", + "微软雅黑", "Microsoft YaHei", SimHei, "Helvetica Neue", Helvetica, Arial, + "IBM Plex Sans Thai Looped", $text-font-stack; +} +[lang="zh-hant"] body { + font-family: LXGWClearGothic, "微軟正黑體", "Microsoft JhengHei", "新細明體", + "PMingLiU", "細明體", "MingLiU", "蘋果儷中黑", "Apple LiGothic Medium", + "儷黑 Pro", "LiHei Pro Medium", "IBM Plex Sans Thai Looped", + $text-font-stack; +} + +[lang="ja"] body { + font-family: "Noto Sans JP", "ヒラギノ角ゴ Pro", "Hiragino Kaku Gothic Pro", + "メイリオ", Meiryo, Osaka, "MS Pゴシック", "MS PGothic", "MS Gothic", + "MS ゴシック", "Helvetica Neue", "IBM Plex Sans Thai Looped", Helvetica, + Arial, $text-font-stack; +} + +html { + font-family: sans-serif; + -ms-text-size-adjust: 100%; + -webkit-text-size-adjust: 100%; +} + +code, +pre { + font-size: 0.85rem; + font-family: $code-font-stack; +} + +.h1 { + font-size: 4rem; +} + +.h2 { + font-size: 3.5rem; +} + +.h3 { + font-size: 3rem; +} + +.h4 { + font-size: 2.5rem; +} + +.h5 { + font-size: 2rem; +} + +.h6 { + font-size: 1.5rem; +} + +.p1 { + font-size: 1.2rem; +} + +.p2 { + font-size: 1rem; +} + +.caption { + font-size: 0.8rem; +} diff --git a/config/_default/params.toml b/config/_default/params.toml index 30381c56..3e56e1e2 100644 --- a/config/_default/params.toml +++ b/config/_default/params.toml @@ -23,8 +23,6 @@ enableNavbar = true enableFooter = true showPoweredBy = true -fontsLink = "https://fonts.googleapis.com/css2?family=Noto+Sans+SC&family=Noto+Sans&display=swap" - tocLevels = ["h2", "h3", "h4"] paginateWindow = 1 taxoPaginate = 13 @@ -39,45 +37,3 @@ github = "https://github.com/mtf-wiki/MtF-Wiki" enableComment = false disqus_shortname = "" commento = false - -[gitment] # Gitment is a comment system based on GitHub issues. see https://github.com/imsun/gitment - owner = "" # Your GitHub ID - repo = "" # The repo to store comments - clientId = "" # Your client ID - clientSecret = "" # Your client secret - -[utterances] # https://utteranc.es/ - owner = "" # Your GitHub ID - repo = "" # The repo to store comments - -[gitalk] # Gitalk is a comment system based on GitHub issues. see https://github.com/gitalk/gitalk - owner = "" # Your GitHub ID - repo = "" # The repo to store comments - clientId = "" # Your client ID - clientSecret = "" # Your client secret - -# Valine. -# You can get your appid and appkey from https://leancloud.cn -# more info please open https://valine.js.org -[valine] - enable = false - appId = '你的appId' - appKey = '你的appKey' - notify = false # mail notifier , https://github.com/xCss/Valine/wiki - verify = false # Verification code - avatar = 'mm' - placeholder = '说点什么吧...' - visitor = false - -[changyan] - changyanAppid = "" # Changyan app id # 畅言 - changyanAppkey = "" # Changyan app key - -[livere] - livereUID = "" # LiveRe UID # 来必力 - -# Isso: https://posativ.org/isso/ -[isso] - enable = false - scriptSrc = "" # "https://isso.example.com/js/embed.min.js" - dataAttrs = "" # "data-isso='https://isso.example.com' data-isso-require-author='true'" diff --git a/data/font.toml b/data/font.toml index 25c6255d..29b426bc 100644 --- a/data/font.toml +++ b/data/font.toml @@ -1,2 +1,2 @@ -title_font = "\"Montserrat\", Georgia, -apple-system, \"Noto Sans\", \"Noto Sans CJK SC\", \"PingFang SC\", \"Hiragino Sans GB\", \"Microsoft Yahei\", \"ST Heiti\", sans-serif" -content_font = "\"muli\", Georgia, -apple-system, \"Noto Sans\", \"Noto Sans SC\", \"Noto Sans CJK SC\", \"PingFang SC\", \"Hiragino Sans GB\", \"Microsoft Yahei\", \"ST Heiti\", sans-serif" +title_font = "!default" +content_font = "!default" diff --git a/static/fonts/LXGWClearGothic-Regular.ttf b/static/fonts/LXGWClearGothic-Regular.ttf new file mode 100644 index 00000000..ad4d3ebd Binary files /dev/null and b/static/fonts/LXGWClearGothic-Regular.ttf differ