Просмотр исходного кода

feat(desktop): more mono (nerd) fonts

Adam 1 месяц назад
Родитель
Сommit
e9ef72c20f
55 измененных файлов с 145 добавлено и 4 удалено
  1. BIN
      packages/ui/src/assets/fonts/BlexMonoNerdFontMono-Bold.woff2
  2. BIN
      packages/ui/src/assets/fonts/BlexMonoNerdFontMono-Medium.woff2
  3. BIN
      packages/ui/src/assets/fonts/BlexMonoNerdFontMono-Regular.woff2
  4. BIN
      packages/ui/src/assets/fonts/CaskaydiaCoveNerdFontMono-Bold.woff2
  5. BIN
      packages/ui/src/assets/fonts/CaskaydiaCoveNerdFontMono-Regular.woff2
  6. BIN
      packages/ui/src/assets/fonts/FiraCodeNerdFontMono-Bold.woff2
  7. BIN
      packages/ui/src/assets/fonts/FiraCodeNerdFontMono-Regular.woff2
  8. BIN
      packages/ui/src/assets/fonts/GeistMonoNerdFontMono-Bold.woff2
  9. BIN
      packages/ui/src/assets/fonts/GeistMonoNerdFontMono-Medium.woff2
  10. BIN
      packages/ui/src/assets/fonts/GeistMonoNerdFontMono-Regular.woff2
  11. BIN
      packages/ui/src/assets/fonts/HackNerdFontMono-Bold.woff2
  12. BIN
      packages/ui/src/assets/fonts/HackNerdFontMono-Regular.woff2
  13. BIN
      packages/ui/src/assets/fonts/InconsolataNerdFontMono-Bold.woff2
  14. BIN
      packages/ui/src/assets/fonts/InconsolataNerdFontMono-Regular.woff2
  15. BIN
      packages/ui/src/assets/fonts/IntoneMonoNerdFontMono-Bold.woff2
  16. BIN
      packages/ui/src/assets/fonts/IntoneMonoNerdFontMono-Regular.woff2
  17. BIN
      packages/ui/src/assets/fonts/JetBrainsMonoNerdFontMono-Bold.woff2
  18. BIN
      packages/ui/src/assets/fonts/JetBrainsMonoNerdFontMono-Regular.woff2
  19. BIN
      packages/ui/src/assets/fonts/MesloLGSNerdFontMono-Bold.woff2
  20. BIN
      packages/ui/src/assets/fonts/MesloLGSNerdFontMono-Regular.woff2
  21. BIN
      packages/ui/src/assets/fonts/RobotoMonoNerdFontMono-Bold.woff2
  22. BIN
      packages/ui/src/assets/fonts/RobotoMonoNerdFontMono-Regular.woff2
  23. BIN
      packages/ui/src/assets/fonts/SauceCodeProNerdFontMono-Bold.woff2
  24. BIN
      packages/ui/src/assets/fonts/SauceCodeProNerdFontMono-Regular.woff2
  25. BIN
      packages/ui/src/assets/fonts/UbuntuMonoNerdFontMono-Bold.woff2
  26. BIN
      packages/ui/src/assets/fonts/UbuntuMonoNerdFontMono-Regular.woff2
  27. 1 0
      packages/ui/src/assets/fonts/cascadia-code-nerd-font-bold.woff2
  28. 1 0
      packages/ui/src/assets/fonts/cascadia-code-nerd-font.woff2
  29. 1 0
      packages/ui/src/assets/fonts/fira-code-nerd-font-bold.woff2
  30. 1 0
      packages/ui/src/assets/fonts/fira-code-nerd-font.woff2
  31. 1 0
      packages/ui/src/assets/fonts/geist-mono-bold.woff2
  32. 1 0
      packages/ui/src/assets/fonts/geist-mono-medium.woff2
  33. BIN
      packages/ui/src/assets/fonts/geist-mono.woff2
  34. 1 0
      packages/ui/src/assets/fonts/geist-mono.woff2
  35. 1 0
      packages/ui/src/assets/fonts/hack-nerd-font-bold.woff2
  36. 1 0
      packages/ui/src/assets/fonts/hack-nerd-font.woff2
  37. 1 0
      packages/ui/src/assets/fonts/ibm-plex-mono-bold.woff2
  38. 1 0
      packages/ui/src/assets/fonts/ibm-plex-mono-medium.woff2
  39. BIN
      packages/ui/src/assets/fonts/ibm-plex-mono.woff2
  40. 1 0
      packages/ui/src/assets/fonts/ibm-plex-mono.woff2
  41. 1 0
      packages/ui/src/assets/fonts/inconsolata-nerd-font-bold.woff2
  42. 1 0
      packages/ui/src/assets/fonts/inconsolata-nerd-font.woff2
  43. 1 0
      packages/ui/src/assets/fonts/intel-one-mono-nerd-font-bold.woff2
  44. 1 0
      packages/ui/src/assets/fonts/intel-one-mono-nerd-font.woff2
  45. 1 0
      packages/ui/src/assets/fonts/jetbrains-mono-nerd-font-bold.woff2
  46. 1 0
      packages/ui/src/assets/fonts/jetbrains-mono-nerd-font.woff2
  47. 1 0
      packages/ui/src/assets/fonts/meslo-lgs-nerd-font-bold.woff2
  48. 1 0
      packages/ui/src/assets/fonts/meslo-lgs-nerd-font.woff2
  49. 1 0
      packages/ui/src/assets/fonts/roboto-mono-nerd-font-bold.woff2
  50. 1 0
      packages/ui/src/assets/fonts/roboto-mono-nerd-font.woff2
  51. 1 0
      packages/ui/src/assets/fonts/source-code-pro-nerd-font-bold.woff2
  52. 1 0
      packages/ui/src/assets/fonts/source-code-pro-nerd-font.woff2
  53. 1 0
      packages/ui/src/assets/fonts/ubuntu-mono-nerd-font-bold.woff2
  54. 1 0
      packages/ui/src/assets/fonts/ubuntu-mono-nerd-font.woff2
  55. 119 4
      packages/ui/src/components/font.tsx

BIN
packages/ui/src/assets/fonts/BlexMonoNerdFontMono-Bold.woff2


BIN
packages/ui/src/assets/fonts/BlexMonoNerdFontMono-Medium.woff2


BIN
packages/ui/src/assets/fonts/BlexMonoNerdFontMono-Regular.woff2


BIN
packages/ui/src/assets/fonts/CaskaydiaCoveNerdFontMono-Bold.woff2


BIN
packages/ui/src/assets/fonts/CaskaydiaCoveNerdFontMono-Regular.woff2


BIN
packages/ui/src/assets/fonts/FiraCodeNerdFontMono-Bold.woff2


BIN
packages/ui/src/assets/fonts/FiraCodeNerdFontMono-Regular.woff2


BIN
packages/ui/src/assets/fonts/GeistMonoNerdFontMono-Bold.woff2


BIN
packages/ui/src/assets/fonts/GeistMonoNerdFontMono-Medium.woff2


BIN
packages/ui/src/assets/fonts/GeistMonoNerdFontMono-Regular.woff2


BIN
packages/ui/src/assets/fonts/HackNerdFontMono-Bold.woff2


BIN
packages/ui/src/assets/fonts/HackNerdFontMono-Regular.woff2


BIN
packages/ui/src/assets/fonts/InconsolataNerdFontMono-Bold.woff2


BIN
packages/ui/src/assets/fonts/InconsolataNerdFontMono-Regular.woff2


BIN
packages/ui/src/assets/fonts/IntoneMonoNerdFontMono-Bold.woff2


BIN
packages/ui/src/assets/fonts/IntoneMonoNerdFontMono-Regular.woff2


BIN
packages/ui/src/assets/fonts/JetBrainsMonoNerdFontMono-Bold.woff2


BIN
packages/ui/src/assets/fonts/JetBrainsMonoNerdFontMono-Regular.woff2


BIN
packages/ui/src/assets/fonts/MesloLGSNerdFontMono-Bold.woff2


BIN
packages/ui/src/assets/fonts/MesloLGSNerdFontMono-Regular.woff2


BIN
packages/ui/src/assets/fonts/RobotoMonoNerdFontMono-Bold.woff2


BIN
packages/ui/src/assets/fonts/RobotoMonoNerdFontMono-Regular.woff2


BIN
packages/ui/src/assets/fonts/SauceCodeProNerdFontMono-Bold.woff2


BIN
packages/ui/src/assets/fonts/SauceCodeProNerdFontMono-Regular.woff2


BIN
packages/ui/src/assets/fonts/UbuntuMonoNerdFontMono-Bold.woff2


BIN
packages/ui/src/assets/fonts/UbuntuMonoNerdFontMono-Regular.woff2


+ 1 - 0
packages/ui/src/assets/fonts/cascadia-code-nerd-font-bold.woff2

@@ -0,0 +1 @@
+CaskaydiaCoveNerdFontMono-Bold.woff2

+ 1 - 0
packages/ui/src/assets/fonts/cascadia-code-nerd-font.woff2

@@ -0,0 +1 @@
+CaskaydiaCoveNerdFontMono-Regular.woff2

+ 1 - 0
packages/ui/src/assets/fonts/fira-code-nerd-font-bold.woff2

@@ -0,0 +1 @@
+FiraCodeNerdFontMono-Bold.woff2

+ 1 - 0
packages/ui/src/assets/fonts/fira-code-nerd-font.woff2

@@ -0,0 +1 @@
+FiraCodeNerdFontMono-Regular.woff2

+ 1 - 0
packages/ui/src/assets/fonts/geist-mono-bold.woff2

@@ -0,0 +1 @@
+GeistMonoNerdFontMono-Bold.woff2

+ 1 - 0
packages/ui/src/assets/fonts/geist-mono-medium.woff2

@@ -0,0 +1 @@
+GeistMonoNerdFontMono-Medium.woff2

BIN
packages/ui/src/assets/fonts/geist-mono.woff2


+ 1 - 0
packages/ui/src/assets/fonts/geist-mono.woff2

@@ -0,0 +1 @@
+GeistMonoNerdFontMono-Regular.woff2

+ 1 - 0
packages/ui/src/assets/fonts/hack-nerd-font-bold.woff2

@@ -0,0 +1 @@
+HackNerdFontMono-Bold.woff2

+ 1 - 0
packages/ui/src/assets/fonts/hack-nerd-font.woff2

@@ -0,0 +1 @@
+HackNerdFontMono-Regular.woff2

+ 1 - 0
packages/ui/src/assets/fonts/ibm-plex-mono-bold.woff2

@@ -0,0 +1 @@
+BlexMonoNerdFontMono-Bold.woff2

+ 1 - 0
packages/ui/src/assets/fonts/ibm-plex-mono-medium.woff2

@@ -0,0 +1 @@
+BlexMonoNerdFontMono-Medium.woff2

BIN
packages/ui/src/assets/fonts/ibm-plex-mono.woff2


+ 1 - 0
packages/ui/src/assets/fonts/ibm-plex-mono.woff2

@@ -0,0 +1 @@
+BlexMonoNerdFontMono-Regular.woff2

+ 1 - 0
packages/ui/src/assets/fonts/inconsolata-nerd-font-bold.woff2

@@ -0,0 +1 @@
+InconsolataNerdFontMono-Bold.woff2

+ 1 - 0
packages/ui/src/assets/fonts/inconsolata-nerd-font.woff2

@@ -0,0 +1 @@
+InconsolataNerdFontMono-Regular.woff2

+ 1 - 0
packages/ui/src/assets/fonts/intel-one-mono-nerd-font-bold.woff2

@@ -0,0 +1 @@
+IntoneMonoNerdFontMono-Bold.woff2

+ 1 - 0
packages/ui/src/assets/fonts/intel-one-mono-nerd-font.woff2

@@ -0,0 +1 @@
+IntoneMonoNerdFontMono-Regular.woff2

+ 1 - 0
packages/ui/src/assets/fonts/jetbrains-mono-nerd-font-bold.woff2

@@ -0,0 +1 @@
+JetBrainsMonoNerdFontMono-Bold.woff2

+ 1 - 0
packages/ui/src/assets/fonts/jetbrains-mono-nerd-font.woff2

@@ -0,0 +1 @@
+JetBrainsMonoNerdFontMono-Regular.woff2

+ 1 - 0
packages/ui/src/assets/fonts/meslo-lgs-nerd-font-bold.woff2

@@ -0,0 +1 @@
+MesloLGSNerdFontMono-Bold.woff2

+ 1 - 0
packages/ui/src/assets/fonts/meslo-lgs-nerd-font.woff2

@@ -0,0 +1 @@
+MesloLGSNerdFontMono-Regular.woff2

+ 1 - 0
packages/ui/src/assets/fonts/roboto-mono-nerd-font-bold.woff2

@@ -0,0 +1 @@
+RobotoMonoNerdFontMono-Bold.woff2

+ 1 - 0
packages/ui/src/assets/fonts/roboto-mono-nerd-font.woff2

@@ -0,0 +1 @@
+RobotoMonoNerdFontMono-Regular.woff2

+ 1 - 0
packages/ui/src/assets/fonts/source-code-pro-nerd-font-bold.woff2

@@ -0,0 +1 @@
+SauceCodeProNerdFontMono-Bold.woff2

+ 1 - 0
packages/ui/src/assets/fonts/source-code-pro-nerd-font.woff2

@@ -0,0 +1 @@
+SauceCodeProNerdFontMono-Regular.woff2

+ 1 - 0
packages/ui/src/assets/fonts/ubuntu-mono-nerd-font-bold.woff2

@@ -0,0 +1 @@
+UbuntuMonoNerdFontMono-Bold.woff2

+ 1 - 0
packages/ui/src/assets/fonts/ubuntu-mono-nerd-font.woff2

@@ -0,0 +1 @@
+UbuntuMonoNerdFontMono-Regular.woff2

+ 119 - 4
packages/ui/src/components/font.tsx

@@ -1,6 +1,106 @@
 import { Style, Link } from "@solidjs/meta"
 import inter from "../assets/fonts/inter.woff2"
-import ibmPlexMono from "../assets/fonts/ibm-plex-mono.woff2"
+import ibmPlexMonoRegular from "../assets/fonts/ibm-plex-mono.woff2"
+import ibmPlexMonoMedium from "../assets/fonts/ibm-plex-mono-medium.woff2"
+import ibmPlexMonoBold from "../assets/fonts/ibm-plex-mono-bold.woff2"
+
+import cascadiaCode from "../assets/fonts/cascadia-code-nerd-font.woff2"
+import cascadiaCodeBold from "../assets/fonts/cascadia-code-nerd-font-bold.woff2"
+import firaCode from "../assets/fonts/fira-code-nerd-font.woff2"
+import firaCodeBold from "../assets/fonts/fira-code-nerd-font-bold.woff2"
+import hack from "../assets/fonts/hack-nerd-font.woff2"
+import hackBold from "../assets/fonts/hack-nerd-font-bold.woff2"
+import inconsolata from "../assets/fonts/inconsolata-nerd-font.woff2"
+import inconsolataBold from "../assets/fonts/inconsolata-nerd-font-bold.woff2"
+import intelOneMono from "../assets/fonts/intel-one-mono-nerd-font.woff2"
+import intelOneMonoBold from "../assets/fonts/intel-one-mono-nerd-font-bold.woff2"
+import jetbrainsMono from "../assets/fonts/jetbrains-mono-nerd-font.woff2"
+import jetbrainsMonoBold from "../assets/fonts/jetbrains-mono-nerd-font-bold.woff2"
+import mesloLgs from "../assets/fonts/meslo-lgs-nerd-font.woff2"
+import mesloLgsBold from "../assets/fonts/meslo-lgs-nerd-font-bold.woff2"
+import robotoMono from "../assets/fonts/roboto-mono-nerd-font.woff2"
+import robotoMonoBold from "../assets/fonts/roboto-mono-nerd-font-bold.woff2"
+import sourceCodePro from "../assets/fonts/source-code-pro-nerd-font.woff2"
+import sourceCodeProBold from "../assets/fonts/source-code-pro-nerd-font-bold.woff2"
+import ubuntuMono from "../assets/fonts/ubuntu-mono-nerd-font.woff2"
+import ubuntuMonoBold from "../assets/fonts/ubuntu-mono-nerd-font-bold.woff2"
+
+type MonoFont = {
+  family: string
+  regular: string
+  bold: string
+}
+
+export const MONO_NERD_FONTS = [
+  {
+    family: "JetBrains Mono Nerd Font",
+    regular: jetbrainsMono,
+    bold: jetbrainsMonoBold,
+  },
+  {
+    family: "Fira Code Nerd Font",
+    regular: firaCode,
+    bold: firaCodeBold,
+  },
+  {
+    family: "Cascadia Code Nerd Font",
+    regular: cascadiaCode,
+    bold: cascadiaCodeBold,
+  },
+  {
+    family: "Hack Nerd Font",
+    regular: hack,
+    bold: hackBold,
+  },
+  {
+    family: "Source Code Pro Nerd Font",
+    regular: sourceCodePro,
+    bold: sourceCodeProBold,
+  },
+  {
+    family: "Inconsolata Nerd Font",
+    regular: inconsolata,
+    bold: inconsolataBold,
+  },
+  {
+    family: "Roboto Mono Nerd Font",
+    regular: robotoMono,
+    bold: robotoMonoBold,
+  },
+  {
+    family: "Ubuntu Mono Nerd Font",
+    regular: ubuntuMono,
+    bold: ubuntuMonoBold,
+  },
+  {
+    family: "Intel One Mono Nerd Font",
+    regular: intelOneMono,
+    bold: intelOneMonoBold,
+  },
+  {
+    family: "Meslo LGS Nerd Font",
+    regular: mesloLgs,
+    bold: mesloLgsBold,
+  },
+] satisfies MonoFont[]
+
+const monoNerdCss = MONO_NERD_FONTS.map(
+  (font) => `
+        @font-face {
+          font-family: "${font.family}";
+          src: url("${font.regular}") format("woff2");
+          font-display: swap;
+          font-style: normal;
+          font-weight: 400;
+        }
+        @font-face {
+          font-family: "${font.family}";
+          src: url("${font.bold}") format("woff2");
+          font-display: swap;
+          font-style: normal;
+          font-weight: 700;
+        }`,
+).join("")
 
 export const Font = () => {
   return (
@@ -23,10 +123,24 @@ export const Font = () => {
         }
         @font-face {
           font-family: "IBM Plex Mono";
-          src: url("${ibmPlexMono}") format("woff2-variations");
+          src: url("${ibmPlexMonoRegular}") format("woff2");
+          font-display: swap;
+          font-style: normal;
+          font-weight: 400;
+        }
+        @font-face {
+          font-family: "IBM Plex Mono";
+          src: url("${ibmPlexMonoMedium}") format("woff2");
+          font-display: swap;
+          font-style: normal;
+          font-weight: 500;
+        }
+        @font-face {
+          font-family: "IBM Plex Mono";
+          src: url("${ibmPlexMonoBold}") format("woff2");
           font-display: swap;
           font-style: normal;
-          font-weight: 400 700;
+          font-weight: 700;
         }
         @font-face {
           font-family: "IBM Plex Mono Fallback";
@@ -36,9 +150,10 @@ export const Font = () => {
           descent-override: 25%;
           line-gap-override: 1%;
         }
+${monoNerdCss}
       `}</Style>
       <Link rel="preload" href={inter} as="font" type="font/woff2" crossorigin="anonymous" />
-      <Link rel="preload" href={ibmPlexMono} as="font" type="font/woff2" crossorigin="anonymous" />
+      <Link rel="preload" href={ibmPlexMonoRegular} as="font" type="font/woff2" crossorigin="anonymous" />
     </>
   )
 }