diff --git a/public/fonts/LXGWWenKai-Regular.woff b/public/fonts/LXGWWenKai-Regular.woff new file mode 100644 index 0000000..b145579 Binary files /dev/null and b/public/fonts/LXGWWenKai-Regular.woff differ diff --git a/public/fonts/LXGWWenKai-Regular.woff2 b/public/fonts/LXGWWenKai-Regular.woff2 new file mode 100644 index 0000000..fbcae0a Binary files /dev/null and b/public/fonts/LXGWWenKai-Regular.woff2 differ diff --git a/src/App.vue b/src/App.vue index a6919fc..5dce0e4 100644 --- a/src/App.vue +++ b/src/App.vue @@ -121,8 +121,6 @@ export default class App extends Vue z-index: 2 pointer-events: none - font-family: "Microsoft YaHei UI", $font - #menu padding: 5px 10px margin: 15px 10px diff --git a/src/css/font.sass b/src/css/font.sass new file mode 100644 index 0000000..9048538 --- /dev/null +++ b/src/css/font.sass @@ -0,0 +1,7 @@ +@font-face + font-family: 'WenKai' + src: url("/fonts/LXGWWenKai-Regular.woff2") format('woff2'), url("/fonts/LXGWWenKai-Regular.woff") format('woff') + +.font-custom + font-family: "WenKai", var(--font-fallback) + //line-height: 1.3em diff --git a/src/css/global.sass b/src/css/global.sass index 313350f..6a4cce2 100644 --- a/src/css/global.sass +++ b/src/css/global.sass @@ -1,4 +1,5 @@ @import colors +@import font // Google Fonts // TODO: Localize @@ -7,7 +8,9 @@ @import url('https://fonts.googleapis.com/css2?family=Caveat&display=swap') @import url('https://fonts.googleapis.com/css2?family=Noto+Sans+SC&display=swap') -$font: "Noto Sans SC", Avenir, Helvetica, Arial, sans-serif +html + --font-fallback: "Noto Sans SC", Avenir, Helvetica, Arial, sans-serif + @extend .font-custom .font-code font-family: Inconsolata, Monaco, Monospaced, serif @@ -113,7 +116,6 @@ body text-overflow: ellipsis #app - font-family: $font -webkit-font-smoothing: antialiased -moz-osx-font-smoothing: grayscale text-align: center