diff --git a/components/CommonHead.js b/components/CommonHead.js index 203cb402..b496255b 100644 --- a/components/CommonHead.js +++ b/components/CommonHead.js @@ -40,6 +40,8 @@ const CommonHead = ({ meta }) => { )} + {/* 谷歌字体镜像 */} + } diff --git a/lib/cjk.js b/lib/cjk.js deleted file mode 100644 index 478dd005..00000000 --- a/lib/cjk.js +++ /dev/null @@ -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 - } -} diff --git a/lib/font.js b/lib/font.js new file mode 100644 index 00000000..c75810c0 --- /dev/null +++ b/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 diff --git a/public/fonts/IBMPlexSansVar-Italic.woff2 b/public/fonts/IBMPlexSansVar-Italic.woff2 deleted file mode 100644 index 29b46d19..00000000 Binary files a/public/fonts/IBMPlexSansVar-Italic.woff2 and /dev/null differ diff --git a/public/fonts/IBMPlexSansVar-Roman.woff2 b/public/fonts/IBMPlexSansVar-Roman.woff2 deleted file mode 100644 index c58615dd..00000000 Binary files a/public/fonts/IBMPlexSansVar-Roman.woff2 and /dev/null differ diff --git a/public/fonts/SourceSerif-Italic.var.woff2 b/public/fonts/SourceSerif-Italic.var.woff2 deleted file mode 100644 index 24d617d0..00000000 Binary files a/public/fonts/SourceSerif-Italic.var.woff2 and /dev/null differ diff --git a/public/fonts/SourceSerif.var.woff2 b/public/fonts/SourceSerif.var.woff2 deleted file mode 100644 index 370649cf..00000000 Binary files a/public/fonts/SourceSerif.var.woff2 and /dev/null differ diff --git a/tailwind.config.js b/tailwind.config.js index c8254a31..bd57d456 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -1,28 +1,11 @@ const BLOG = require('./blog.config') -const { fontFamily } = require('tailwindcss/defaultTheme') -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()}"`] +const fontFamilies = require('./lib/font') + module.exports = { purge: ['./pages/**/*.js', './components/**/*.js', './layouts/**/*.js', './themes/**/*.js'], darkMode: BLOG.APPEARANCE === 'class' ? 'media' : 'class', // or 'media' or 'class' theme: { - fontFamily: { - 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' - ] - }, + fontFamily: fontFamilies, extend: { colors: { day: {