Fix fonts

ffffranklin · ffffranklin · commit 5951a561f33e · 2025-08-26T12:13:12.000-07:00
diff --git a/app/layout.tsx b/app/layout.tsx
@@ -1,14 +1,25 @@
-import {Metadata} from 'next';
+import { Metadata } from 'next';
 import packageInfo from '../package.json';
 import React from 'react';
 import styles from './layout.module.scss';
+import { Martel, Open_Sans } from 'next/font/google';
+
+const martel = Martel({
+  weight: ['200', '300', '400', '600', '700', '800', '900'],
+  subsets: ['latin'],
+});
+
+const openSans = Open_Sans({
+  weight: ['300', '400', '800'],
+  subsets: ['latin'],
+});
 
 export const metadata: Metadata = {
   title: 'Franklin Clark',
   description: packageInfo.description,
-  authors: {name: packageInfo.author},
+  authors: { name: packageInfo.author },
   keywords: packageInfo.keywords,
-  icons: { icon: '/img/favico.png' }
+  icons: { icon: '/img/favico.png' },
 };
 
 /**
@@ -19,14 +30,19 @@ export const metadata: Metadata = {
 export default function RootLayout({
   children,
 }: {
-  children: React.ReactNode
+  children: React.ReactNode;
 }) {
   return (
     <>
-      <html lang="en" className={styles.normalize}>
-        <body>
-          {children}
-        </body>
+      <html
+        lang='en'
+        className={[
+          styles.normalize,
+          martel.className,
+          openSans.className,
+        ].join(' ')}
+      >
+        <body>{children}</body>
       </html>
     </>
   );
diff --git a/styles/athena/_type.scss b/styles/athena/_type.scss
@@ -1,4 +1,4 @@
-@import url('https://fonts.googleapis.com/css?family=Open+Sans:400,800,300|Martel:200,300,400,600,700,800,900');
+//@import url('https://fonts.googleapis.com/css?family=Open+Sans:400,800,300|Martel:200,300,400,600,700,800,900');
 
 // We use these to define default font stacks
 $font-family-open-sans: "Open Sans", "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@import url('https://fonts.googleapis.com/css?family=Open+Sans:400,800,300\|Martel:200,300,400,600,700,800,900');`
	`1`	`+//@import url('https://fonts.googleapis.com/css?family=Open+Sans:400,800,300\|Martel:200,300,400,600,700,800,900');`
`2`	`2`
`3`	`3`	`// We use these to define default font stacks`
`4`	`4`	`$font-family-open-sans: "Open Sans", "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif;`