Merge branch 'main' into theme-hexo

components/CommonHead.js

@@ -40,6 +40,8 @@ const CommonHead = ({ meta }) => {
         <meta property='article:author' content={BLOG.AUTHOR} />
       </>
     )}
+    {/* 谷歌字体镜像 */}
+    <link href="https://fonts.loli.net/css2?family=Noto+Serif+SC&display=swap" rel="stylesheet"/>
   </Head>
 }
 

lib/cjk.js

@@ -1,21 +0,0 @@
-const BLOG = require('../blog.config')
-
-module.exports = function () {
-  switch (BLOG.LANG.toLowerCase()) {
-    case 'zh-cn':
-    case 'zh-sg':
-      return 'SC'
-    case 'zh':
-    case 'zh-hk':
-    case 'zh-tw':
-      return 'TC'
-    case 'ja':
-    case 'ja-jp':
-      return 'JP'
-    case 'ko':
-    case 'ko-kr':
-      return 'KR'
-    default:
-      return null
-  }
-}

lib/font.js

@@ -0,0 +1,52 @@
+/**
+ * 在此处配置字体
+ */
+const BLOG = require('../blog.config')
+// const { fontFamily } = require('tailwindcss/defaultTheme')
+
+function CJK () {
+  switch (BLOG.LANG.toLowerCase()) {
+    case 'zh-cn':
+    case 'zh-sg':
+      return 'SC'
+    case 'zh':
+    case 'zh-hk':
+    case 'zh-tw':
+      return 'TC'
+    case 'ja':
+    case 'ja-jp':
+      return 'JP'
+    case 'ko':
+    case 'ko-kr':
+      return 'KR'
+    default:
+      return null
+  }
+}
+
+const fontSansCJK = !CJK()
+  ? []
+  : [`"Noto Sans CJK ${CJK()}"`, `"Noto Sans ${CJK()}"`]
+const fontSerifCJK = !CJK()
+  ? []
+  : [`"Noto Serif CJK ${CJK()}"`, `"Noto Serif ${CJK()}"`]
+
+const fontFamilies = {
+  sans: ['-apple-system', 'BlinkMacSystemFont', '"Apple Color Emoji"',
+    '"Segoe UI Emoji"', '"Segoe UI Symbol"', '"Segoe UI"', '"PingFang SC"',
+    'HarmonyOS_Regular', '"Hiragino Sans GB"', '"Microsoft YaHei"', '"Helvetica Neue"',
+    'Helvetica', '"Source Han Sans SC"', '"Noto Sans CJK SC"', '"WenQuanYi Micro Hei"',
+    'Arial', 'sans-serif', ...fontSansCJK],
+  serif: ['STZhongsong', 'STSong', '"Noto Serif CJK"', '"Noto Serif SC"', 'PMingLiu',
+    'SimSun', '"WenQuanYi Bitmap Song"', '"Times New Roman"', 'Times', 'serif',
+    '"Apple Color Emoji"', '"Segoe UI Emoji"', '"Segoe UI Symbol"', ...fontSerifCJK],
+  noEmoji: [
+    'ui-sans-serif',
+    'system-ui',
+    '-apple-system',
+    'BlinkMacSystemFont',
+    'sans-serif'
+  ]
+}
+
+module.exports = fontFamilies

tailwind.config.js

@@ -1,28 +1,11 @@
 const BLOG = require('./blog.config')
-const { fontFamily } = require('tailwindcss/defaultTheme')
+const fontFamilies = require('./lib/font')
-const CJK = require('./lib/cjk')
+
-const fontSansCJK = !CJK()
-  ? []
-  : [`"Noto Sans CJK ${CJK()}"`, `"Noto Sans ${CJK()}"`]
-const fontSerifCJK = !CJK()
-  ? []
-  : [`"Noto Serif CJK ${CJK()}"`, `"Noto Serif ${CJK()}"`]
 module.exports = {
   purge: ['./pages/**/*.js', './components/**/*.js', './layouts/**/*.js', './themes/**/*.js'],
   darkMode: BLOG.APPEARANCE === 'class' ? 'media' : 'class', // or 'media' or 'class'
   theme: {
-    fontFamily: {
+    fontFamily: fontFamilies,
-      sans: ['"IBM Plex Sans"', ...fontFamily.sans, ...fontSansCJK],
-      serif: ['"Source Serif"', ...fontFamily.serif, ...fontSerifCJK],
-      noEmoji: [
-        '"IBM Plex Sans"',
-        'ui-sans-serif',
-        'system-ui',
-        '-apple-system',
-        'BlinkMacSystemFont',
-        'sans-serif'
-      ]
-    },
     extend: {
       colors: {
         day: {