diff --git a/client/app/fonts/GeistMonoVF.woff b/client/app/fonts/GeistMonoVF.woff
deleted file mode 100644
index f2ae185..0000000
Binary files a/client/app/fonts/GeistMonoVF.woff and /dev/null differ
diff --git a/client/app/fonts/GeistVF.woff b/client/app/fonts/GeistVF.woff
deleted file mode 100644
index 1b62daa..0000000
Binary files a/client/app/fonts/GeistVF.woff and /dev/null differ
diff --git a/client/app/globals.css b/client/app/globals.css
index b4e2f10..4d1491e 100644
--- a/client/app/globals.css
+++ b/client/app/globals.css
@@ -2,10 +2,11 @@
@tailwind components;
@tailwind utilities;
-@import url("https://fonts.googleapis.com/css2?family=Roboto:wght@400;500;700&family=JetBrains+Mono:wght@400;500;700&family=Bitcount_Grid_Single&display=swap");
+@import url("https://fonts.googleapis.com/css2?family=JetBrains+Mono:wght@400;500;700&display=swap");
@layer base {
:root {
+ --font-bitcount-grid: "Bitcount Grid Single", monospace;
--background: rgb(251, 241, 199);
--foreground: rgb(60, 56, 54);
--card: rgb(235, 219, 178);
@@ -79,10 +80,13 @@
@layer base {
body {
- font-family: var(--font-roboto), sans-serif;
+ font-family: var(--font-bitcount-grid);
+ }
+ .editor-font {
+ font-family: "JetBrains Mono", monospace;
}
textarea {
- font-family: var(--font-jetbrains-mono), monospace;
+ font-family: "JetBrains Mono", monospace;
}
}
@@ -188,7 +192,7 @@
}
.ui-font {
- font-family: var(--font-bitcount-grid, "Bitcount Grid Single", monospace);
+ font-family: var(--font-bitcount-grid);
font-size: 1.1rem;
}
@@ -196,7 +200,7 @@
background-color: var(--card);
color: var(--card-foreground);
border-color: var(--border);
- font-family: var(--font-bitcount-grid, "Bitcount Grid Single", monospace);
+ font-family: var(--font-bitcount-grid);
font-size: 1.2rem;
font-weight: 500;
}
diff --git a/client/app/layout.tsx b/client/app/layout.tsx
index 7919a95..e12260b 100644
--- a/client/app/layout.tsx
+++ b/client/app/layout.tsx
@@ -1,24 +1,5 @@
-import type { Metadata } from "next";
-import localFont from "next/font/local";
-import { Bitcount_Grid_Single } from "next/font/google";
import "./globals.css";
-
-const bitcountGridSingle = Bitcount_Grid_Single({
- weight: "400",
- variable: "--font-bitcount-grid",
- subsets: ["latin"],
-});
-
-const geistSans = localFont({
- src: "./fonts/GeistVF.woff",
- variable: "--font-geist-sans",
- weight: "100 900",
-});
-const geistMono = localFont({
- src: "./fonts/GeistMonoVF.woff",
- variable: "--font-geist-mono",
- weight: "100 900",
-});
+import type { Metadata } from "next";
export const metadata: Metadata = {
title: "Osborne",
@@ -48,10 +29,15 @@ export default function RootLayout({
}>) {
return (
-
+
+
+
+
+
+
{children}
diff --git a/client/tailwind.config.ts b/client/tailwind.config.ts
index 0a22b7d..795d550 100644
--- a/client/tailwind.config.ts
+++ b/client/tailwind.config.ts
@@ -79,8 +79,7 @@ const config = {
},
fontFamily: {
"jetbrains-mono": ["JetBrains Mono", "monospace"],
- roboto: ["Roboto", "sans-serif"],
- "bitcount-grid": ["var(--font-bitcount-grid)", "monospace"],
+ "bitcount-grid": ["Bitcount Grid Single", "monospace"],
},
borderRadius: {
lg: "var(--radius)",