0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🎨 https://github.com/siyuan-note/siyuan/issues/13213

Browse source
This commit is contained in:
Vanessa 2024-12-19 10:19:00 +08:00
parent 7d34a87da4
commit e73f78d57e
14 changed files with 9 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
app/src/assets/fonts/JetBrainsMono-2.304/JetBrainsMono-Regular.woff2 → app/appearance/fonts/JetBrainsMono-2.304/JetBrainsMono-Regular.woff2
View file

0
app/src/assets/fonts/JetBrainsMono-2.304/LICENSE → app/appearance/fonts/JetBrainsMono-2.304/LICENSE
View file

0
app/src/assets/fonts/LxgwWenKai-Lite-1.501/LICENSE → app/appearance/fonts/LxgwWenKai-Lite-1.501/LICENSE
View file

0
app/src/assets/fonts/LxgwWenKai-Lite-1.501/LXGWWenKaiLite-Regular.ttf → app/appearance/fonts/LxgwWenKai-Lite-1.501/LXGWWenKaiLite-Regular.ttf
View file

0
app/src/assets/fonts/Noto-COLRv1-2.047/LICENSE → app/appearance/fonts/Noto-COLRv1-2.047/LICENSE
View file

0
app/src/assets/fonts/Noto-COLRv1-2.047/Noto-COLRv1.woff2 → app/appearance/fonts/Noto-COLRv1-2.047/Noto-COLRv1.woff2
View file

4
app/electron-builder.yml
View file

@ -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"
to: "pandoc.zip"

2
app/src/assets/scss/component/_typography.scss
View file

@ -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,

2
app/src/assets/template/app/index.tpl
View file

@ -5,6 +5,8 @@
<!-- https://electronjs.org/docs/tutorial/security#csp-meta-tag
<meta http-equiv="Content-Security-Policy" content="script-src 'self'"/>-->
<style id="editorAttr" type="text/css"></style>
<link rel="preload" href="../../../appearance/fonts/Noto-COLRv1-2.047/Noto-COLRv1.woff2" as="font" type="font/woff2" crossorigin>
<link rel="preload" href="../../../appearance/fonts/JetBrainsMono-2.304/JetBrainsMono-Regular.woff2" as="font" type="font/woff2" crossorigin>
<script src="../../protyle/js/pdf/pdf.min.mjs?v=4.7.85" type="module"></script>
</head>
<body class="fn__flex-column">

8
app/src/util/assets.ts
View file

@ -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"),

7
app/webpack.config.js
View file

@ -75,13 +75,6 @@ module.exports = (env, argv) => {
},
],
},
{
test: /\.woff2$/,
type: "asset/resource",
generator: {
filename: "../fonts/[name][ext]",
},
},
{
test: /\.(png|svg)$/,
use: [

7
app/webpack.desktop.js
View file

@ -78,13 +78,6 @@ module.exports = (env, argv) => {
},
],
},
{
test: /\.woff2$/,
type: "asset/resource",
generator: {
filename: "../fonts/[name][ext]",
},
},
{
test: /\.(png|svg)$/,
use: [

7
app/webpack.export.js
View file

@ -71,13 +71,6 @@ module.exports = (env, argv) => {
},
],
},
{
test: /\.woff2$/,
type: "asset/resource",
generator: {
filename: "../fonts/[name][ext]",
},
},
],
},
plugins: [

7
app/webpack.mobile.js
View file

@ -79,13 +79,6 @@ module.exports = (env, argv) => {
},
],
},
{
test: /\.woff2$/,
type: "asset/resource",
generator: {
filename: "../fonts/[name][ext]",
},
},
{
test: /\.(png|svg)$/,
use: [