diff --git a/napcat.webui/public/fonts/FiraCode-VariableFont_wght.ttf b/napcat.webui/public/fonts/FiraCode-VariableFont_wght.ttf deleted file mode 100644 index 5655ed51..00000000 Binary files a/napcat.webui/public/fonts/FiraCode-VariableFont_wght.ttf and /dev/null differ diff --git a/napcat.webui/public/fonts/LibreBaskerville/LibreBaskerville-Bold.ttf b/napcat.webui/public/fonts/LibreBaskerville/LibreBaskerville-Bold.ttf deleted file mode 100644 index f415f3e9..00000000 Binary files a/napcat.webui/public/fonts/LibreBaskerville/LibreBaskerville-Bold.ttf and /dev/null differ diff --git a/napcat.webui/public/fonts/LibreBaskerville/LibreBaskerville-Italic.ttf b/napcat.webui/public/fonts/LibreBaskerville/LibreBaskerville-Italic.ttf deleted file mode 100644 index 152c1e37..00000000 Binary files a/napcat.webui/public/fonts/LibreBaskerville/LibreBaskerville-Italic.ttf and /dev/null differ diff --git a/napcat.webui/public/fonts/LibreBaskerville/LibreBaskerville-Regular.ttf b/napcat.webui/public/fonts/LibreBaskerville/LibreBaskerville-Regular.ttf deleted file mode 100644 index 8b871395..00000000 Binary files a/napcat.webui/public/fonts/LibreBaskerville/LibreBaskerville-Regular.ttf and /dev/null differ diff --git a/napcat.webui/public/fonts/NotoSerifSC-VariableFont_wght.ttf b/napcat.webui/public/fonts/NotoSerifSC-VariableFont_wght.ttf deleted file mode 100644 index 6168dac0..00000000 Binary files a/napcat.webui/public/fonts/NotoSerifSC-VariableFont_wght.ttf and /dev/null differ diff --git a/napcat.webui/public/fonts/Outfit-VariableFont_wght.ttf b/napcat.webui/public/fonts/Outfit-VariableFont_wght.ttf deleted file mode 100644 index 96106f09..00000000 Binary files a/napcat.webui/public/fonts/Outfit-VariableFont_wght.ttf and /dev/null 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 deleted file mode 100755 index 5c925d1f..00000000 Binary files a/napcat.webui/public/fonts/harmony/HarmonyOS_Sans_SC_Bold.ttf and /dev/null 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 deleted file mode 100755 index aff150a1..00000000 Binary files a/napcat.webui/public/fonts/harmony/HarmonyOS_Sans_SC_Regular.ttf and /dev/null differ diff --git a/napcat.webui/public/fonts/ubuntu/Ubuntu-Bold.ttf b/napcat.webui/public/fonts/ubuntu/Ubuntu-Bold.ttf deleted file mode 100644 index c2293d5c..00000000 Binary files a/napcat.webui/public/fonts/ubuntu/Ubuntu-Bold.ttf and /dev/null differ diff --git a/napcat.webui/public/fonts/ubuntu/Ubuntu-BoldItalic.ttf b/napcat.webui/public/fonts/ubuntu/Ubuntu-BoldItalic.ttf deleted file mode 100644 index ce6e784d..00000000 Binary files a/napcat.webui/public/fonts/ubuntu/Ubuntu-BoldItalic.ttf and /dev/null differ diff --git a/napcat.webui/public/fonts/ubuntu/Ubuntu-Italic.ttf b/napcat.webui/public/fonts/ubuntu/Ubuntu-Italic.ttf deleted file mode 100644 index a599244e..00000000 Binary files a/napcat.webui/public/fonts/ubuntu/Ubuntu-Italic.ttf and /dev/null differ diff --git a/napcat.webui/public/fonts/ubuntu/Ubuntu-Light.ttf b/napcat.webui/public/fonts/ubuntu/Ubuntu-Light.ttf deleted file mode 100644 index b310d150..00000000 Binary files a/napcat.webui/public/fonts/ubuntu/Ubuntu-Light.ttf and /dev/null differ diff --git a/napcat.webui/public/fonts/ubuntu/Ubuntu-LightItalic.ttf b/napcat.webui/public/fonts/ubuntu/Ubuntu-LightItalic.ttf deleted file mode 100644 index ad0741b4..00000000 Binary files a/napcat.webui/public/fonts/ubuntu/Ubuntu-LightItalic.ttf and /dev/null differ diff --git a/napcat.webui/public/fonts/ubuntu/Ubuntu-Medium.ttf b/napcat.webui/public/fonts/ubuntu/Ubuntu-Medium.ttf deleted file mode 100644 index 7340a40a..00000000 Binary files a/napcat.webui/public/fonts/ubuntu/Ubuntu-Medium.ttf and /dev/null differ diff --git a/napcat.webui/public/fonts/ubuntu/Ubuntu-MediumItalic.ttf b/napcat.webui/public/fonts/ubuntu/Ubuntu-MediumItalic.ttf deleted file mode 100644 index 36ac1aed..00000000 Binary files a/napcat.webui/public/fonts/ubuntu/Ubuntu-MediumItalic.ttf and /dev/null differ diff --git a/napcat.webui/public/fonts/ubuntu/Ubuntu-Regular.ttf b/napcat.webui/public/fonts/ubuntu/Ubuntu-Regular.ttf deleted file mode 100644 index f98a2dab..00000000 Binary files a/napcat.webui/public/fonts/ubuntu/Ubuntu-Regular.ttf and /dev/null differ diff --git a/napcat.webui/src/components/xterm.tsx b/napcat.webui/src/components/xterm.tsx index f9ee8a1a..0600f519 100644 --- a/napcat.webui/src/components/xterm.tsx +++ b/napcat.webui/src/components/xterm.tsx @@ -39,9 +39,11 @@ const XTerm = forwardRef((props, ref) => { } const terminal = new Terminal({ allowTransparency: true, - fontFamily: '"Fira Code", "Harmony", "Noto Serif SC", monospace', + fontFamily: '"JetBrains Mono", "Aa偷吃可爱长大的", "Noto Serif SC", monospace', cursorInactiveStyle: 'outline', - drawBoldTextInBrightColors: false + drawBoldTextInBrightColors: false, + fontSize: 14, + lineHeight: 1.2 }) terminalRef.current = terminal const fitAddon = new FitAddon() @@ -53,7 +55,7 @@ const XTerm = forwardRef((props, ref) => { }) ) terminal.loadAddon(fitAddon) - terminal.loadAddon(new WebglAddon()) + //terminal.loadAddon(new WebglAddon()) terminal.open(domRef.current) terminal.writeln( diff --git a/napcat.webui/src/fonts/AaCute.ttf b/napcat.webui/src/fonts/AaCute.ttf new file mode 100644 index 00000000..e3ee1ee4 Binary files /dev/null and b/napcat.webui/src/fonts/AaCute.ttf differ diff --git a/napcat.webui/src/fonts/JetBrainsMono.ttf b/napcat.webui/src/fonts/JetBrainsMono.ttf new file mode 100644 index 00000000..b60e77f5 Binary files /dev/null and b/napcat.webui/src/fonts/JetBrainsMono.ttf differ diff --git a/napcat.webui/src/styles/fonts.css b/napcat.webui/src/styles/fonts.css index 07075808..d19aa268 100644 --- a/napcat.webui/src/styles/fonts.css +++ b/napcat.webui/src/styles/fonts.css @@ -1,111 +1,17 @@ -/* HarmonyOS Sans SC */ @font-face { - font-family: 'Harmony'; - src: url('/webui/fonts/harmony/HarmonyOS_Sans_SC_Bold.ttf') format('truetype'); - font-weight: bold; - font-style: normal; + font-family: 'Aa偷吃可爱长大的'; + src: url('../fonts/AaCute.ttf') format('truetype'); + font-weight: normal; } - @font-face { - font-family: 'Harmony'; - src: url('/webui/fonts/harmony/HarmonyOS_Sans_SC_Regular.ttf') format('truetype'); + font-family: 'JetBrains Mono'; + src: url('../fonts/JetBrainsMono.ttf') format('truetype'); font-weight: normal; font-style: normal; } - -/* Ubuntu */ -@font-face { - font-family: 'Ubuntu'; - src: url('/webui/fonts/ubuntu/Ubuntu-Bold.ttf') format('truetype'); - font-weight: bold; - font-style: normal; -} - -@font-face { - font-family: 'Ubuntu'; - src: url('/webui/fonts/ubuntu/Ubuntu-Regular.ttf') format('truetype'); - font-weight: normal; - font-style: normal; -} - -@font-face { - font-family: 'Ubuntu'; - src: url('/webui/fonts/ubuntu/Ubuntu-Light.ttf') format('truetype'); - font-weight: 300; - font-style: normal; -} - -@font-face { - font-family: 'Ubuntu'; - src: url('/webui/fonts/ubuntu/Ubuntu-BoldItalic.ttf') format('truetype'); - font-weight: bold; - font-style: italic; -} - -@font-face { - font-family: 'Ubuntu'; - src: url('/webui/fonts/ubuntu/Ubuntu-Italic.ttf') format('truetype'); - font-weight: normal; - font-style: italic; -} - -@font-face { - font-family: 'Ubuntu'; - src: url('/webui/fonts/ubuntu/Ubuntu-LightItalic.ttf') format('truetype'); - font-weight: 300; - font-style: italic; -} - -@font-face { - font-family: 'Ubuntu'; - src: url('/webui/fonts/ubuntu/Ubuntu-Medium.ttf') format('truetype'); - font-weight: 500; - font-style: normal; -} - -@font-face { - font-family: 'Ubuntu'; - src: url('/webui/fonts/ubuntu/Ubuntu-MediumItalic.ttf') format('truetype'); - font-weight: 500; - font-style: italic; -} - -/* LibreBaskerville */ -@font-face { - font-family: 'Libre Baskerville'; - src: url('/webui/fonts/LibreBaskerville/LibreBaskerville-Bold.ttf') format('truetype'); - font-weight: bold; - font-style: normal; -} - -@font-face { - font-family: 'Libre Baskerville'; - src: url('/webui/fonts/LibreBaskerville/LibreBaskerville-Regular.ttf') format('truetype'); - font-weight: normal; - font-style: normal; -} - -@font-face { - font-family: 'Libre Baskerville'; - src: url('/webui/fonts/LibreBaskerville/LibreBaskerville-Italic.ttf') format('truetype'); - font-weight: normal; - font-style: italic; -} - -/* NotoSerifSC */ -@font-face { - font-family: 'Noto Serif SC'; - src: url('/webui/fonts/NotoSerifSC-VariableFont_wght.ttf') format('truetype'); -} - -/* Outfit */ -@font-face { - font-family: 'Outfit'; - src: url('/webui/fonts/Outfit-VariableFont_wght.ttf') format('truetype'); -} - -/* FiraCode */ -@font-face { - font-family: 'Fira Code'; - src: url('/webui/fonts/FiraCode-VariableFont_wght.ttf') format('truetype'); -} +.xterm { + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + text-rendering: optimizeLegibility; + font-smooth: always; +} \ No newline at end of file diff --git a/napcat.webui/src/styles/globals.css b/napcat.webui/src/styles/globals.css index 5acca3ef..8e028e0d 100644 --- a/napcat.webui/src/styles/globals.css +++ b/napcat.webui/src/styles/globals.css @@ -7,7 +7,7 @@ body { font-family: PingFang SC, - 'Harmony', + 'Aa偷吃可爱长大的', Helvetica Neue, Microsoft YaHei, sans-serif !important; @@ -17,23 +17,23 @@ body { .hm-medium { font-family: PingFang SC, - 'Harmony', + 'Aa偷吃可爱长大的', Helvetica Neue, Microsoft YaHei, sans-serif !important; @apply font-bold; } .font-ubuntu { - font-family: 'Ubuntu', sans-serif; + font-family: 'Aa偷吃可爱长大的', sans-serif; } .font-outfit { - font-family: 'Outfit', sans-serif; + font-family: 'Aa偷吃可爱长大的', sans-serif; } .font-libre { - font-family: 'Libre Baskerville', serif; + font-family: 'Aa偷吃可爱长大的', serif; } .font-noto-serif { - font-family: 'Noto Serif SC', serif; + font-family: 'Aa偷吃可爱长大的', serif; } .hide-scrollbar::-webkit-scrollbar { width: 0 !important;