clean up fonts

storj · Aug 16, 2023 · 65b3de0 · 65b3de0
1 parent aad80ab
commit 65b3de0
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 74 deletions.
diff --git a/app/layout.js b/app/layout.js
@@ -1,17 +1,47 @@
-import '@/styles/tailwind.css'
+import { Inter } from 'next/font/google'
+import localFont from 'next/font/local'
+import clsx from 'clsx'
+
 import { ThemeProvider } from '@/components/theme-provider'
 import { Navigation } from '@/components/Navigation'
 import Navbar from '@/components/Navbar'
 import { Hero as HeroWrap } from '@/components/Hero.client'
 import { Hero } from '@/components/Hero'
 
+import '@/styles/tailwind.css'
+
+const inter = Inter({
+  subsets: ['latin'],
+  display: 'swap',
+  variable: '--font-inter',
+})
+
+// Use local version of Lexend so that we can use OpenType features
+const lexend = localFont({
+  src: '../src/fonts/lexend.woff2',
+  display: 'swap',
+  variable: '--font-lexend',
+})
+
+export const metadata = {
+  title: {
+    template: '%s - Storj Docs',
+    default: 'Storj Docs',
+  },
+  description: 'Make the world your data center',
+}
+
 export default function RootLayout({
   // Layouts must accept a children prop.
   // This will be populated with nested layouts or pages
   children,
 }) {
   return (
-    <html lang="en" suppressHydrationWarning>
+    <html
+      lang="en"
+      className={clsx('h-full antialiased', inter.variable, lexend.variable)}
+      suppressHydrationWarning
+    >
       <head />
       <body className="bg-white dark:bg-slate-900">
         <ThemeProvider attribute="class" defaultTheme="system" enableSystem>

diff --git a/public/fonts/Inter-italic.var.woff2 b/public/fonts/Inter-italic.var.woff2
diff --git a/public/fonts/Inter-roman.var.woff2 b/public/fonts/Inter-roman.var.woff2
diff --git a/public/fonts/lexend.txt → src/fonts/lexend.txt b/public/fonts/lexend.txt → src/fonts/lexend.txt
diff --git a/public/fonts/lexend.woff2 → src/fonts/lexend.woff2 b/public/fonts/lexend.woff2 → src/fonts/lexend.woff2
diff --git a/src/styles/fonts.css b/src/styles/fonts.css
diff --git a/src/styles/prism.css b/src/styles/prism.css
diff --git a/src/styles/tailwind.css b/src/styles/tailwind.css
@@ -1,6 +1,4 @@
 @import 'tailwindcss/base';
-@import './fonts.css';
-@import './prism.css';
 @import 'tailwindcss/components';
 @import 'tailwindcss/utilities';
 .dark {