Merge pull request #107 from shapehq/enhancement/uses-default-font

Updates fonts
shapehq · Oct 30, 2023 · 0fb0c69 · 0fb0c69
2 parents 5449bad + 72ddf16
commit 0fb0c69
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -1,15 +1,12 @@
 import "./globals.css"
 import type { Metadata } from "next"
 import { UserProvider } from "@auth0/nextjs-auth0/client"
-import { Inter } from "next/font/google"
 import { config as fontAwesomeConfig } from "@fortawesome/fontawesome-svg-core"
 import { CssBaseline } from "@mui/material"
 import ThemeRegistry from "@/common/theme/ThemeRegistry"
 import ErrorHandler from "@/common/errorHandling/client/ErrorHandler"
 import "@fortawesome/fontawesome-svg-core/styles.css"
 
-const inter = Inter({ subsets: ["latin"] })
-
 fontAwesomeConfig.autoAddCss = false
 
 export const metadata: Metadata = {
@@ -23,7 +20,7 @@ export default function RootLayout({ children }: { children: React.ReactNode })
       <ThemeRegistry options={{ key: "mui" }}>
         <UserProvider>
           <ErrorHandler>
-            <body className={inter.className}>
+            <body>
               <CssBaseline/>
               {children}
             </body>

diff --git a/src/common/theme/theme.tsx b/src/common/theme/theme.tsx
@@ -19,6 +19,15 @@ const theme = () => createTheme({
     }
   },
   typography: {
+    fontFamily: [
+      "-apple-system",
+      "BlinkMacSystemFont",
+      "\"Segoe UI\"",
+      "Roboto",
+      "\"Helvetica Neue\"",
+      "Arial",
+      "sans-serif"
+    ].join(","),
     button: {
       textTransform: "none"
     }