diff --git a/packages/favor/package-lock.json b/packages/favor/package-lock.json index eb5ed017..7f7711da 100644 --- a/packages/favor/package-lock.json +++ b/packages/favor/package-lock.json @@ -10,6 +10,7 @@ "license": "Apache-2.0", "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", @@ -2584,6 +2585,12 @@ "integrity": "sha512-X8R8Oj771YRl/w+c1HqAC1szL8zWQRwFvgDwT129k9ACdBoud/+/rX9V0qiMl6LWUdP9voC2nDVZYPMQQsb6eA==", "license": "MIT" }, + "node_modules/@fontsource/source-code-pro": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@fontsource/source-code-pro/-/source-code-pro-5.1.0.tgz", + "integrity": "sha512-aT6pQbwEM/oGyK4Q8XOOknFcrXTAnP+GLVuEADBnB4avOYAOa4U5BG/D5JrTobwckuWyKrbMZ8EdcXPsqizfSw==", + "license": "OFL-1.1" + }, "node_modules/@humanwhocodes/module-importer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", diff --git a/packages/favor/package.json b/packages/favor/package.json index d9dfba42..2ab62fb5 100644 --- 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 index c68c3f18..e7f476f7 100644 --- 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 index bc4579a0..59605773 100644 --- 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 index fcbc1026..a6da2f9b 100644 --- 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",