upstream #1

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

View File

@ -3,7 +3,7 @@ import 'css/prism.css'
import 'pliny/search/algolia.css' import 'pliny/search/algolia.css'
import 'katex/dist/katex.css' import 'katex/dist/katex.css'
import { Inter } from 'next/font/google' import { Space_Grotesk } from 'next/font/google'
import { Analytics, AnalyticsConfig } from 'pliny/analytics' import { Analytics, AnalyticsConfig } from 'pliny/analytics'
import { SearchProvider, SearchConfig } from 'pliny/search' import { SearchProvider, SearchConfig } from 'pliny/search'
import Header from '@/components/Header' import Header from '@/components/Header'
@ -13,10 +13,10 @@ import siteMetadata from '@/data/siteMetadata'
import { ThemeProviders } from './theme-providers' import { ThemeProviders } from './theme-providers'
import { Metadata } from 'next' import { Metadata } from 'next'
const inter = Inter({ const space_grotesk = Space_Grotesk({
subsets: ['latin'], subsets: ['latin'],
display: 'swap', display: 'swap',
variable: '--font-inter', variable: '--font-space-grotesk',
}) })
export const metadata: Metadata = { export const metadata: Metadata = {
@ -63,7 +63,7 @@ export default function RootLayout({ children }: { children: React.ReactNode })
return ( return (
<html <html
lang={siteMetadata.language} lang={siteMetadata.language}
className={`${inter.variable} scroll-smooth`} className={`${space_grotesk.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: ['var(--font-inter)', ...fontFamily.sans], sans: ['var(--font-space-grotesk)', ...fontFamily.sans],
}, },
colors: { colors: {
primary: colors.pink, primary: colors.pink,