upstream #1

Merged
jblu merged 1007 commits from upstream into main 2024-11-04 22:35:57 -06:00
2 changed files with 4 additions and 2 deletions
Showing only changes of commit f8a5233460 - Show all commits

View File

@ -15,6 +15,8 @@ import { Metadata } from 'next'
const inter = Inter({ const inter = Inter({
subsets: ['latin'], subsets: ['latin'],
display: 'swap',
variable: '--font-inter',
}) })
export const metadata: Metadata = { export const metadata: Metadata = {
@ -61,7 +63,7 @@ export default function RootLayout({ children }: { children: React.ReactNode })
return ( return (
<html <html
lang={siteMetadata.language} lang={siteMetadata.language}
className={`${inter.className} scroll-smooth`} className={`${inter.variable} scroll-smooth`}
suppressHydrationWarning suppressHydrationWarning
> >
<link rel="apple-touch-icon" sizes="76x76" href="/static/favicons/apple-touch-icon.png" /> <link rel="apple-touch-icon" sizes="76x76" href="/static/favicons/apple-touch-icon.png" />

View File

@ -22,7 +22,7 @@ module.exports = {
14: '3.5rem', 14: '3.5rem',
}, },
fontFamily: { fontFamily: {
sans: ['Inter', ...fontFamily.sans], sans: ['var(--font-inter)', ...fontFamily.sans],
}, },
colors: { colors: {
primary: colors.pink, primary: colors.pink,