fix

napcat.webui/src/components/xterm.tsx

@@ -39,9 +39,11 @@ const XTerm = forwardRef<XTermRef, XTermProps>((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<XTermRef, XTermProps>((props, ref) => {
       })
     )
     terminal.loadAddon(fitAddon)
-    terminal.loadAddon(new WebglAddon())
+    //terminal.loadAddon(new WebglAddon())
     terminal.open(domRef.current)
 
     terminal.writeln(

napcat.webui/src/styles/fonts.css

@@ -1,111 +1,17 @@
-/* HarmonyOS Sans SC */
 @font-face {
-  font-family: 'Harmony';
+  font-family: 'Aa偷吃可爱长大的';
-  src: url('/webui/fonts/harmony/HarmonyOS_Sans_SC_Bold.ttf') format('truetype');
+  src: url('../fonts/AaCute.ttf') format('truetype');
-  font-weight: bold;
+  font-weight: normal;
-  font-style: normal;
 }
-
 @font-face {
-  font-family: 'Harmony';
+  font-family: 'JetBrains Mono';
-  src: url('/webui/fonts/harmony/HarmonyOS_Sans_SC_Regular.ttf') format('truetype');
+  src: url('../fonts/JetBrainsMono.ttf') format('truetype');
   font-weight: normal;
   font-style: normal;
 }
-
+.xterm {
-/* Ubuntu */
+  -webkit-font-smoothing: antialiased;
-@font-face {
+  -moz-osx-font-smoothing: grayscale;
-  font-family: 'Ubuntu';
+  text-rendering: optimizeLegibility;
-  src: url('/webui/fonts/ubuntu/Ubuntu-Bold.ttf') format('truetype');
+  font-smooth: always;
-  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');
 }

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;