diff --git a/napcat.webui/public/fonts/FiraCode-VariableFont_wght.ttf b/napcat.webui/public/fonts/FiraCode-VariableFont_wght.ttf new file mode 100644 index 00000000..5655ed51 Binary files /dev/null and b/napcat.webui/public/fonts/FiraCode-VariableFont_wght.ttf differ diff --git a/napcat.webui/public/fonts/LibreBaskerville/LibreBaskerville-Bold.ttf b/napcat.webui/public/fonts/LibreBaskerville/LibreBaskerville-Bold.ttf new file mode 100644 index 00000000..f415f3e9 Binary files /dev/null and b/napcat.webui/public/fonts/LibreBaskerville/LibreBaskerville-Bold.ttf differ diff --git a/napcat.webui/public/fonts/LibreBaskerville/LibreBaskerville-Italic.ttf b/napcat.webui/public/fonts/LibreBaskerville/LibreBaskerville-Italic.ttf new file mode 100644 index 00000000..152c1e37 Binary files /dev/null and b/napcat.webui/public/fonts/LibreBaskerville/LibreBaskerville-Italic.ttf differ diff --git a/napcat.webui/public/fonts/LibreBaskerville/LibreBaskerville-Regular.ttf b/napcat.webui/public/fonts/LibreBaskerville/LibreBaskerville-Regular.ttf new file mode 100644 index 00000000..8b871395 Binary files /dev/null and b/napcat.webui/public/fonts/LibreBaskerville/LibreBaskerville-Regular.ttf differ diff --git a/napcat.webui/public/fonts/NotoSerifSC-VariableFont_wght.ttf b/napcat.webui/public/fonts/NotoSerifSC-VariableFont_wght.ttf new file mode 100644 index 00000000..6168dac0 Binary files /dev/null and b/napcat.webui/public/fonts/NotoSerifSC-VariableFont_wght.ttf differ diff --git a/napcat.webui/public/fonts/Outfit-VariableFont_wght.ttf b/napcat.webui/public/fonts/Outfit-VariableFont_wght.ttf new file mode 100644 index 00000000..96106f09 Binary files /dev/null and b/napcat.webui/public/fonts/Outfit-VariableFont_wght.ttf differ diff --git a/napcat.webui/public/fonts/harmony/HarmonyOS_Sans_SC_Black.ttf b/napcat.webui/public/fonts/harmony/HarmonyOS_Sans_SC_Black.ttf new file mode 100755 index 00000000..824b3d40 Binary files /dev/null and b/napcat.webui/public/fonts/harmony/HarmonyOS_Sans_SC_Black.ttf differ diff --git a/napcat.webui/public/fonts/harmony/HarmonyOS_Sans_SC_Bold.ttf b/napcat.webui/public/fonts/harmony/HarmonyOS_Sans_SC_Bold.ttf new file mode 100755 index 00000000..5c925d1f Binary files /dev/null and b/napcat.webui/public/fonts/harmony/HarmonyOS_Sans_SC_Bold.ttf differ diff --git a/napcat.webui/public/fonts/harmony/HarmonyOS_Sans_SC_Light.ttf b/napcat.webui/public/fonts/harmony/HarmonyOS_Sans_SC_Light.ttf new file mode 100755 index 00000000..8cfbc9d8 Binary files /dev/null and b/napcat.webui/public/fonts/harmony/HarmonyOS_Sans_SC_Light.ttf differ diff --git a/napcat.webui/public/fonts/harmony/HarmonyOS_Sans_SC_Medium.ttf b/napcat.webui/public/fonts/harmony/HarmonyOS_Sans_SC_Medium.ttf new file mode 100755 index 00000000..350f6a00 Binary files /dev/null and b/napcat.webui/public/fonts/harmony/HarmonyOS_Sans_SC_Medium.ttf differ diff --git a/napcat.webui/public/fonts/harmony/HarmonyOS_Sans_SC_Regular.ttf b/napcat.webui/public/fonts/harmony/HarmonyOS_Sans_SC_Regular.ttf new file mode 100755 index 00000000..aff150a1 Binary files /dev/null and b/napcat.webui/public/fonts/harmony/HarmonyOS_Sans_SC_Regular.ttf differ diff --git a/napcat.webui/public/fonts/harmony/HarmonyOS_Sans_SC_Thin.ttf b/napcat.webui/public/fonts/harmony/HarmonyOS_Sans_SC_Thin.ttf new file mode 100755 index 00000000..6a58b15b Binary files /dev/null and b/napcat.webui/public/fonts/harmony/HarmonyOS_Sans_SC_Thin.ttf differ diff --git a/napcat.webui/public/fonts/ubuntu/Ubuntu-Bold.ttf b/napcat.webui/public/fonts/ubuntu/Ubuntu-Bold.ttf new file mode 100644 index 00000000..c2293d5c Binary files /dev/null and b/napcat.webui/public/fonts/ubuntu/Ubuntu-Bold.ttf differ diff --git a/napcat.webui/public/fonts/ubuntu/Ubuntu-BoldItalic.ttf b/napcat.webui/public/fonts/ubuntu/Ubuntu-BoldItalic.ttf new file mode 100644 index 00000000..ce6e784d Binary files /dev/null and b/napcat.webui/public/fonts/ubuntu/Ubuntu-BoldItalic.ttf differ diff --git a/napcat.webui/public/fonts/ubuntu/Ubuntu-Italic.ttf b/napcat.webui/public/fonts/ubuntu/Ubuntu-Italic.ttf new file mode 100644 index 00000000..a599244e Binary files /dev/null and b/napcat.webui/public/fonts/ubuntu/Ubuntu-Italic.ttf differ diff --git a/napcat.webui/public/fonts/ubuntu/Ubuntu-Light.ttf b/napcat.webui/public/fonts/ubuntu/Ubuntu-Light.ttf new file mode 100644 index 00000000..b310d150 Binary files /dev/null and b/napcat.webui/public/fonts/ubuntu/Ubuntu-Light.ttf differ diff --git a/napcat.webui/public/fonts/ubuntu/Ubuntu-LightItalic.ttf b/napcat.webui/public/fonts/ubuntu/Ubuntu-LightItalic.ttf new file mode 100644 index 00000000..ad0741b4 Binary files /dev/null and b/napcat.webui/public/fonts/ubuntu/Ubuntu-LightItalic.ttf differ diff --git a/napcat.webui/public/fonts/ubuntu/Ubuntu-Medium.ttf b/napcat.webui/public/fonts/ubuntu/Ubuntu-Medium.ttf new file mode 100644 index 00000000..7340a40a Binary files /dev/null and b/napcat.webui/public/fonts/ubuntu/Ubuntu-Medium.ttf differ diff --git a/napcat.webui/public/fonts/ubuntu/Ubuntu-MediumItalic.ttf b/napcat.webui/public/fonts/ubuntu/Ubuntu-MediumItalic.ttf new file mode 100644 index 00000000..36ac1aed Binary files /dev/null and b/napcat.webui/public/fonts/ubuntu/Ubuntu-MediumItalic.ttf differ diff --git a/napcat.webui/public/fonts/ubuntu/Ubuntu-Regular.ttf b/napcat.webui/public/fonts/ubuntu/Ubuntu-Regular.ttf new file mode 100644 index 00000000..f98a2dab Binary files /dev/null and b/napcat.webui/public/fonts/ubuntu/Ubuntu-Regular.ttf differ diff --git a/napcat.webui/src/components/xterm.tsx b/napcat.webui/src/components/xterm.tsx index cf769249..667e6de9 100644 --- a/napcat.webui/src/components/xterm.tsx +++ b/napcat.webui/src/components/xterm.tsx @@ -33,7 +33,7 @@ const XTerm = forwardRef>( } const terminal = new Terminal({ allowTransparency: true, - fontFamily: '"Fira Code", "Noto Serif SC", monospace' // 添加回退字体 + fontFamily: '"Fira Code", "Harmony", "Noto Serif SC", monospace' }) terminalRef.current = terminal const fitAddon = new FitAddon() diff --git a/napcat.webui/src/styles/fonts.css b/napcat.webui/src/styles/fonts.css new file mode 100644 index 00000000..8c65f9fb --- /dev/null +++ b/napcat.webui/src/styles/fonts.css @@ -0,0 +1,139 @@ +/* HarmonyOS Sans SC */ +@font-face { + font-family: 'Harmony'; + src: url('/fonts/harmony/HarmonyOS_Sans_SC_Bold.ttf') format('truetype'); + font-weight: bold; + font-style: normal; +} + +@font-face { + font-family: 'Harmony'; + src: url('/fonts/harmony/HarmonyOS_Sans_SC_Black.ttf') format('truetype'); + font-weight: 900; + font-style: normal; +} + +@font-face { + font-family: 'Harmony'; + src: url('/fonts/harmony/HarmonyOS_Sans_SC_Medium.ttf') format('truetype'); + font-weight: 500; + font-style: normal; +} + +@font-face { + font-family: 'Harmony'; + src: url('/fonts/harmony/HarmonyOS_Sans_SC_Regular.ttf') format('truetype'); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: 'Harmony'; + src: url('/fonts/harmony/HarmonyOS_Sans_SC_Light.ttf') format('truetype'); + font-weight: 300; + font-style: normal; +} + +@font-face { + font-family: 'Harmony'; + src: url('/fonts/harmony/HarmonyOS_Sans_SC_Thin.ttf') format('truetype'); + font-weight: 100; + font-style: normal; +} + +/* Ubuntu */ +@font-face { + font-family: 'Ubuntu'; + src: url('/fonts/ubuntu/Ubuntu-Bold.ttf') format('truetype'); + font-weight: bold; + font-style: normal; +} + +@font-face { + font-family: 'Ubuntu'; + src: url('/fonts/ubuntu/Ubuntu-Regular.ttf') format('truetype'); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: 'Ubuntu'; + src: url('/fonts/ubuntu/Ubuntu-Light.ttf') format('truetype'); + font-weight: 300; + font-style: normal; +} + +@font-face { + font-family: 'Ubuntu'; + src: url('/fonts/ubuntu/Ubuntu-BoldItalic.ttf') format('truetype'); + font-weight: bold; + font-style: italic; +} + +@font-face { + font-family: 'Ubuntu'; + src: url('/fonts/ubuntu/Ubuntu-Italic.ttf') format('truetype'); + font-weight: normal; + font-style: italic; +} + +@font-face { + font-family: 'Ubuntu'; + src: url('/fonts/ubuntu/Ubuntu-LightItalic.ttf') format('truetype'); + font-weight: 300; + font-style: italic; +} + +@font-face { + font-family: 'Ubuntu'; + src: url('/fonts/pingfang/Ubuntu-Medium.ttf') format('truetype'); + font-weight: 500; + font-style: normal; +} + +@font-face { + font-family: 'Ubuntu'; + src: url('/fonts/pingfang/Ubuntu-MediumItalic.ttf') format('truetype'); + font-weight: 500; + font-style: italic; +} + +/* LibreBaskerville */ +@font-face { + font-family: 'Libre Baskerville'; + src: url('/fonts/LibreBaskerville/LibreBaskerville-Bold.ttf') format('truetype'); + font-weight: bold; + font-style: normal; +} + +@font-face { + font-family: 'Libre Baskerville'; + src: url('/fonts/LibreBaskerville/LibreBaskerville-Regular.ttf') format('truetype'); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: 'Libre Baskerville'; + src: url('/fonts/LibreBaskerville/LibreBaskerville-Italic.ttf') format('truetype'); + font-weight: normal; + font-style: italic; +} + +/* NotoSerifSC */ +@font-face { + font-family: 'Noto Serif SC'; + src: url('/fonts/NotoSerifSC-VariableFont_wght.ttf') format('truetype'); +} + +/* Outfit */ +@font-face { + font-family: 'Outfit'; + src: url('/fonts/Outfit-VariableFont_wght.ttf') format('truetype'); +} + +/* FiraCode */ +@font-face { + font-family: 'Fira Code'; + src: url('/fonts/FiraCode-VariablFont_wght.ttf') format('truetype'); +} diff --git a/napcat.webui/src/styles/globals.css b/napcat.webui/src/styles/globals.css index 8c5773e6..875d2a02 100644 --- a/napcat.webui/src/styles/globals.css +++ b/napcat.webui/src/styles/globals.css @@ -1,17 +1,15 @@ -@import url("https://s1.hdslb.com/bfs/static/jinkela/long/font/regular.css"); -@import url("https://s1.hdslb.com/bfs/static/jinkela/long/font/medium.css"); -@import url('https://fonts.googleapis.com/css2?family=Libre+Baskerville:ital,wght@0,400;0,700;1,400&family=Fira+Code:wght@300..700&family=Noto+Serif+SC:wght@200..900&family=Outfit:wght@100..900&family=Ubuntu:ital,wght@0,300;0,400;0,500;0,700;1,300;1,400;1,500;1,700&display=swap'); +@import url("./fonts.css"); @tailwind base; @tailwind components; @tailwind utilities; body { - font-family: PingFang SC,HarmonyOS_Regular,Helvetica Neue,Microsoft YaHei,sans-serif !important; + font-family: PingFang SC,"Harmony",Helvetica Neue,Microsoft YaHei,sans-serif !important; } @layer components { .hm-medium { - font-family: PingFang SC,HarmonyOS_Medium,Helvetica Neue,Microsoft YaHei,sans-serif !important; + font-family: PingFang SC,"Harmony",Helvetica Neue,Microsoft YaHei,sans-serif !important; @apply font-bold; } .font-ubuntu { @@ -94,4 +92,4 @@ body { } .ql-stroke { stroke: currentColor; -} */ \ No newline at end of file +} */