favor: bundle Source Code Pro + better fallback

adobe · Sep 14, 2024 · f6cfc44 · f6cfc44
1 parent 3e0cd70
commit f6cfc44
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 2 deletions.
diff --git a/packages/favor/package-lock.json b/packages/favor/package-lock.json
diff --git a/packages/favor/package.json b/packages/favor/package.json
@@ -57,6 +57,7 @@
   },
   "dependencies": {
     "@codemirror/lang-json": "^6.0.1",
+    "@fontsource/source-code-pro": "^5.1.0",
     "@solid-primitives/storage": "^4.1.0",
     "better-sqlite3": "^11.1.2",
     "codemirror": "^6.0.1",

diff --git a/packages/favor/src/app.tsx b/packages/favor/src/app.tsx
@@ -14,6 +14,7 @@ import { ErrorBoundary, Show } from "solid-js";
 import Main from "./app/main.tsx";
 import LoadingSplash from "./components/LoadingSplash.tsx";
 import { manifest } from "./signals/pardon-config.ts";
+import "@fontsource/source-code-pro";
 
 function PageLoader(props) {
   return (

diff --git a/packages/favor/src/components/codemirror/CodeMirror.tsx b/packages/favor/src/components/codemirror/CodeMirror.tsx
@@ -125,7 +125,7 @@ export default function CodeMirror(props: CodeMirrorProps) {
       ".cm-content": {
         caretColor: "var(--text1)",
         fontSize: props.text ?? "12pt",
-        fontFamily: '"Source Code Pro", "Monaco", "monospace"',
+        fontFamily: '"Source Code Pro", "Consolas", monospace',
       },
     }),
   );

diff --git a/packages/favor/tailwind.config.js b/packages/favor/tailwind.config.js
@@ -7,7 +7,7 @@ export default {
   plugins: [corvu],
   theme: {
     fontFamily: {
-      mono: ["Source Code Pro", "Monaco", "monospace"],
+      mono: ["Source Code Pro", "Consolas", "monospace"],
       sans: [
         "Source Code Pro",
         "-apple-system",