Merge version_4 into main #4

Merged
bender merged 3 commits from version_4 into main 2026-02-25 13:38:27 +00:00
3 changed files with 9 additions and 9 deletions

View File

@@ -1,12 +1,12 @@
import type { Metadata } from "next";
import { Cormorant_Garamond } from "next/font/google";
import { Inter_Tight } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const cormorantGaramond = Cormorant_Garamond({
variable: "--font-cormorant-garamond", subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
const interTight = Inter_Tight({
variable: "--font-inter-tight", subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
});
export const metadata: Metadata = {
@@ -22,7 +22,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${cormorantGaramond.variable} antialiased`}
className={`${interTight.variable} antialiased`}
>
<Tag />
{children}
@@ -1397,4 +1397,4 @@ export default function RootLayout({
</ServiceWrapper>
</html>
);
}
}

View File

@@ -189,4 +189,4 @@ export default function HomePage() {
</div>
</ThemeProvider>
);
}
}

View File

@@ -11,7 +11,7 @@ html {
body {
background-color: var(--background);
color: var(--foreground);
font-family: var(--font-font-family: var(--font-cormorant-garamond), serif;), sans-serif;
font-family: var(--font-font-family: var(--font-inter-tight), serif;), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-font-family: var(--font-cormorant-garamond), serif;), sans-serif;
font-family: var(--font-font-family: var(--font-inter-tight), serif;), sans-serif;
}