diff --git a/app/src/assets/fonts/JetBrainsMono-2.304/JetBrainsMono-Regular.woff2 b/app/appearance/fonts/JetBrainsMono-2.304/JetBrainsMono-Regular.woff2 similarity index 100% rename from app/src/assets/fonts/JetBrainsMono-2.304/JetBrainsMono-Regular.woff2 rename to app/appearance/fonts/JetBrainsMono-2.304/JetBrainsMono-Regular.woff2 diff --git a/app/src/assets/fonts/JetBrainsMono-2.304/LICENSE b/app/appearance/fonts/JetBrainsMono-2.304/LICENSE similarity index 100% rename from app/src/assets/fonts/JetBrainsMono-2.304/LICENSE rename to app/appearance/fonts/JetBrainsMono-2.304/LICENSE diff --git a/app/src/assets/fonts/LxgwWenKai-Lite-1.501/LICENSE b/app/appearance/fonts/LxgwWenKai-Lite-1.501/LICENSE similarity index 100% rename from app/src/assets/fonts/LxgwWenKai-Lite-1.501/LICENSE rename to app/appearance/fonts/LxgwWenKai-Lite-1.501/LICENSE diff --git a/app/src/assets/fonts/LxgwWenKai-Lite-1.501/LXGWWenKaiLite-Regular.ttf b/app/appearance/fonts/LxgwWenKai-Lite-1.501/LXGWWenKaiLite-Regular.ttf similarity index 100% rename from app/src/assets/fonts/LxgwWenKai-Lite-1.501/LXGWWenKaiLite-Regular.ttf rename to app/appearance/fonts/LxgwWenKai-Lite-1.501/LXGWWenKaiLite-Regular.ttf diff --git a/app/src/assets/fonts/Noto-COLRv1-2.047/LICENSE b/app/appearance/fonts/Noto-COLRv1-2.047/LICENSE similarity index 100% rename from app/src/assets/fonts/Noto-COLRv1-2.047/LICENSE rename to app/appearance/fonts/Noto-COLRv1-2.047/LICENSE diff --git a/app/src/assets/fonts/Noto-COLRv1-2.047/Noto-COLRv1.woff2 b/app/appearance/fonts/Noto-COLRv1-2.047/Noto-COLRv1.woff2 similarity index 100% rename from app/src/assets/fonts/Noto-COLRv1-2.047/Noto-COLRv1.woff2 rename to app/appearance/fonts/Noto-COLRv1-2.047/Noto-COLRv1.woff2 diff --git a/app/electron-builder.yml b/app/electron-builder.yml index 6722b2531..e3795adf1 100644 --- a/app/electron-builder.yml +++ b/app/electron-builder.yml @@ -67,8 +67,8 @@ extraResources: - from: "appearance/themes/daylight" to: "appearance/themes/daylight" filter: "!**/{.DS_Store,custom.css}" - - from: "src/assets/fonts" + - from: "appearance/fonts" to: "appearance/fonts" filter: "!**/{.DS_Store}" - from: "pandoc/pandoc-windows-amd64.zip" - to: "pandoc.zip" \ No newline at end of file + to: "pandoc.zip" diff --git a/app/src/assets/scss/component/_typography.scss b/app/src/assets/scss/component/_typography.scss index 49062e575..d8712198e 100644 --- a/app/src/assets/scss/component/_typography.scss +++ b/app/src/assets/scss/component/_typography.scss @@ -1,6 +1,6 @@ @font-face { font-family: 'JetBrainsMono-Regular'; - src: url(../fonts/JetBrainsMono-2.304/JetBrainsMono-Regular.woff2) format('woff2'); + src: url(../../../appearance/fonts/JetBrainsMono-2.304/JetBrainsMono-Regular.woff2) format('woff2'); } .b3-typography, diff --git a/app/src/assets/template/app/index.tpl b/app/src/assets/template/app/index.tpl index f70d7ff5e..8af775581 100644 --- a/app/src/assets/template/app/index.tpl +++ b/app/src/assets/template/app/index.tpl @@ -5,6 +5,8 @@ + + diff --git a/app/src/util/assets.ts b/app/src/util/assets.ts index 2f4de4b6d..1462cebaf 100644 --- a/app/src/util/assets.ts +++ b/app/src/util/assets.ts @@ -208,7 +208,7 @@ export const setInlineStyle = async (set = true) => { if (isMac() || isIPad() || isIPhone()) { style = `@font-face { font-family: "Emojis Additional"; - src: url(stage/build/fonts/Noto-COLRv1.woff2) format("woff2"); + src: url(../../../appearance/fonts/Noto-COLRv1-2.047/Noto-COLRv1.woff2) format("woff2"); unicode-range: U+1fae9, U+1fac6, U+1fabe, U+1fadc, U+e50a, U+1fa89, U+1fadf, U+1f1e6-1f1ff, U+1fa8f; } @font-face { @@ -231,7 +231,7 @@ export const setInlineStyle = async (set = true) => { if (isWin11Browser) { style = `@font-face { font-family: "Emojis Additional"; - src: url(stage/build/fonts/Noto-COLRv1.woff2) format("woff2"); + src: url(../../../appearance/fonts/Noto-COLRv1-2.047/Noto-COLRv1.woff2) format("woff2"); unicode-range: U+1fae9, U+1fac6, U+1fabe, U+1fadc, U+e50a, U+1fa89, U+1fadf, U+1f1e6-1f1ff, U+1f3f4, U+e0067, U+e0062, U+e0065, U+e006e, U+e0067, U+e007f, U+e0073, U+e0063, U+e0074, U+e0077, U+e006c; } @@ -251,7 +251,7 @@ export const setInlineStyle = async (set = true) => { style = ` @font-face { font-family: "Emojis Reset"; - src: url(stage/build/fonts/Noto-COLRv1.woff2) format("woff2"); + src: url(../../../appearance/fonts/Noto-COLRv1-2.047/Noto-COLRv1.woff2) format("woff2"); unicode-range: U+263a, U+2194-2199, U+2934-2935, U+2639, U+26a0, U+25b6, U+25c0, U+23cf, U+2640, U+2642, U+203c, U+2049, U+2611, U+303d, U+00a9, U+00ae, U+2122, U+1f170-1f171, U+24c2, U+1f17e, U+1f17f, U+1f22f, U+1f250, U+1f21a, U+1f232-1f23a, U+1f251, U+3297, U+3299, U+25aa, U+25ab, U+2660, U+2666, U+2665, U+2663, U+1f636, U+1f62e, U+1f642, @@ -260,7 +260,7 @@ export const setInlineStyle = async (set = true) => { } @font-face { font-family: "Emojis"; - src: url(stage/build/fonts/Noto-COLRv1.woff2) format("woff2"), + src: url(../../../appearance/fonts/Noto-COLRv1-2.047/Noto-COLRv1.woff2) format("woff2"), local("Segoe UI Emoji"), local("Segoe UI Symbol"), local("Apple Color Emoji"), diff --git a/app/webpack.config.js b/app/webpack.config.js index 7214a69aa..ffb490e58 100644 --- a/app/webpack.config.js +++ b/app/webpack.config.js @@ -75,13 +75,6 @@ module.exports = (env, argv) => { }, ], }, - { - test: /\.woff2$/, - type: "asset/resource", - generator: { - filename: "../fonts/[name][ext]", - }, - }, { test: /\.(png|svg)$/, use: [ diff --git a/app/webpack.desktop.js b/app/webpack.desktop.js index f67361b42..fef265146 100644 --- a/app/webpack.desktop.js +++ b/app/webpack.desktop.js @@ -78,13 +78,6 @@ module.exports = (env, argv) => { }, ], }, - { - test: /\.woff2$/, - type: "asset/resource", - generator: { - filename: "../fonts/[name][ext]", - }, - }, { test: /\.(png|svg)$/, use: [ diff --git a/app/webpack.export.js b/app/webpack.export.js index 7ed57f74d..3df070097 100644 --- a/app/webpack.export.js +++ b/app/webpack.export.js @@ -71,13 +71,6 @@ module.exports = (env, argv) => { }, ], }, - { - test: /\.woff2$/, - type: "asset/resource", - generator: { - filename: "../fonts/[name][ext]", - }, - }, ], }, plugins: [ diff --git a/app/webpack.mobile.js b/app/webpack.mobile.js index 672e4edae..59bb4c8b7 100644 --- a/app/webpack.mobile.js +++ b/app/webpack.mobile.js @@ -79,13 +79,6 @@ module.exports = (env, argv) => { }, ], }, - { - test: /\.woff2$/, - type: "asset/resource", - generator: { - filename: "../fonts/[name][ext]", - }, - }, { test: /\.(png|svg)$/, use: [