Restore usage of Cera Pro

Houston-ARTCC · Jan 27, 2025 · d8a5260 · d8a5260
1 parent c6cd2a5
commit d8a5260
Show file tree

Hide file tree

Showing 13 changed files with 41 additions and 23 deletions.
diff --git a/package.json b/package.json
@@ -10,7 +10,6 @@
     "lint:fix": "next lint --fix"
   },
   "dependencies": {
-    "@fontsource/montserrat": "5.1.1",
     "@headlessui/react": "2.2.0",
     "@hookform/resolvers": "3.3.4",
     "@sentry/nextjs": "^7.107.0",

diff --git a/src/app/fonts.tsx b/src/app/fonts.tsx
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -5,7 +5,7 @@ import { Disclaimer } from '@/components/static/Disclaimer';
 import { Footer } from '@/components/static/Footer';
 import { Navbar } from '@/components/static/Navbar';
 import { Toastify } from '@/components/static/Toastify';
-import './fonts';
+import { ceraPro } from '@/fonts';
 import './globals.css';
 
 export const metadata = {
@@ -25,7 +25,7 @@ export const viewport = {
 };
 
 const Root = ({ children }: PropsWithChildren) => (
-    <html lang="en" className="h-full scroll-pt-36" suppressHydrationWarning>
+    <html lang="en" className={`${ceraPro.variable} h-full scroll-pt-36`} suppressHydrationWarning>
         <body className="h-full">
             <ThemeProvider attribute="class">
                 <NextAuthProvider>

diff --git a/src/components/static/Navbar.tsx b/src/components/static/Navbar.tsx
@@ -35,7 +35,7 @@ const Brand: React.FC<BrandProps> = ({ light }) => (
         />
         <h6
             className={classNames(
-                'mt-1 text-lg font-bold leading-none',
+                'mt-1 text-xl font-bold leading-none',
                 { 'text-gray-900 dark:text-zinc-200': !light, 'text-white': light },
             )}
         >

diff --git a/src/fonts/CeraPro-Bold.woff2 b/src/fonts/CeraPro-Bold.woff2
diff --git a/src/fonts/CeraPro-BoldItalic.woff2 b/src/fonts/CeraPro-BoldItalic.woff2
diff --git a/src/fonts/CeraPro-Light.woff2 b/src/fonts/CeraPro-Light.woff2
diff --git a/src/fonts/CeraPro-Medium.woff2 b/src/fonts/CeraPro-Medium.woff2
diff --git a/src/fonts/CeraPro-Regular.woff2 b/src/fonts/CeraPro-Regular.woff2
diff --git a/src/fonts/CeraPro-RegularItalic.woff2 b/src/fonts/CeraPro-RegularItalic.woff2
diff --git a/src/fonts/index.ts b/src/fonts/index.ts
@@ -0,0 +1,37 @@
+import localFont from 'next/font/local';
+
+export const ceraPro = localFont({
+    src: [
+        {
+            path: './CeraPro-Light.woff2',
+            weight: '300',
+            style: 'normal',
+        },
+        {
+            path: './CeraPro-Regular.woff2',
+            weight: '400',
+            style: 'normal',
+        },
+        {
+            path: './CeraPro-RegularItalic.woff2',
+            weight: '400',
+            style: 'italic',
+        },
+        {
+            path: './CeraPro-Medium.woff2',
+            weight: '500',
+            style: 'normal',
+        },
+        {
+            path: './CeraPro-Bold.woff2',
+            weight: '700',
+            style: 'normal',
+        },
+        {
+            path: './CeraPro-BoldItalic.woff2',
+            weight: '700',
+            style: 'italic',
+        },
+    ],
+    variable: '--font-cera-pro',
+});
diff --git a/tailwind.config.js b/tailwind.config.js
@@ -6,7 +6,7 @@ module.exports = {
     ],
     theme: {
         fontFamily: {
-            sans: ['"Montserrat"', 'sans-serif'],
+            sans: ['var(--font-cera-pro)'],
             mono: ['monospace'],
         },
         extend: {

diff --git a/yarn.lock b/yarn.lock
@@ -496,13 +496,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@fontsource/montserrat@npm:5.1.1":
-  version: 5.1.1
-  resolution: "@fontsource/montserrat@npm:5.1.1"
-  checksum: 755d3af7026094cbc1cfffb45cd9f06dbf4ef3d0399aa1e18f2a3055c370cdf80f5c6b6a42a98a492244b9207f45da61364c437dba71423fae2a130ab2a6c37c
-  languageName: node
-  linkType: hard
-
 "@headlessui/react@npm:2.2.0":
   version: 2.2.0
   resolution: "@headlessui/react@npm:2.2.0"
@@ -8120,7 +8113,6 @@ __metadata:
   resolution: "zhu-frontend@workspace:."
   dependencies:
     "@biomejs/biome": "npm:1.6.1"
-    "@fontsource/montserrat": "npm:5.1.1"
     "@headlessui/react": "npm:2.2.0"
     "@hookform/resolvers": "npm:3.3.4"
     "@sentry/nextjs": "npm:^7.107.0"