This commit is contained in:
Mackie 2026-06-03 23:10:53 +08:00
parent cac5ea56ff
commit 55b6fbe0ae
2 changed files with 11 additions and 23 deletions

View file

@ -1,5 +1,4 @@
import type { Metadata } from 'next'
import { cn } from '@/utilities/ui'
import { GeistMono } from 'geist/font/mono'
import { GeistSans } from 'geist/font/sans'
@ -12,9 +11,8 @@ import { Providers } from '@/providers'
import { InitTheme } from '@/providers/Theme/InitTheme'
import { mergeOpenGraph } from '@/utilities/mergeOpenGraph'
import { draftMode } from 'next/headers'
import './globals.css'
import { getServerSideURL } from '@/utilities/getURL'
import './globals.css'
export default async function RootLayout({ children }: { children: React.ReactNode }) {
const { isEnabled } = await draftMode()
@ -30,14 +28,9 @@ export default async function RootLayout({ children }: { children: React.ReactNo
href="https://cdn.jsdelivr.net/npm/@tabler/icons-webfont@latest/dist/tabler-icons.min.css"
/>
</head>
<body>
<body className="font-sans">
<Providers>
<AdminBar
adminBarProps={{
preview: isEnabled,
}}
/>
<AdminBar adminBarProps={{ preview: isEnabled }} />
<Header />
{children}
<Footer />

View file

@ -2,6 +2,10 @@
const config = {
theme: {
extend: {
fontFamily: {
sans: ['var(--font-geist-sans)'],
mono: ['var(--font-geist-mono)'],
},
typography: {
DEFAULT: {
css: [
@ -18,25 +22,16 @@ const config = {
base: {
css: [
{
h1: {
fontSize: '2.5rem',
},
h2: {
fontSize: '1.25rem',
fontWeight: 600,
},
h1: { fontSize: '2.5rem' },
h2: { fontSize: '1.25rem', fontWeight: 600 },
},
],
},
md: {
css: [
{
h1: {
fontSize: '3.5rem',
},
h2: {
fontSize: '1.5rem',
},
h1: { fontSize: '3.5rem' },
h2: { fontSize: '1.5rem' },
},
],
},