development/035b1d0b-57aa-4a21-9b98-b36a91f0529d
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_4 into main #3

Merged
development merged 3 commits from version_4 into main 2026-01-25 15:09:45 +00:00
Conversation 0 Commits 3 Files Changed 3 +8 -9
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/globals.css
View File

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

11
src/app/layout.tsx
View File

@@ -1,12 +1,11 @@
import type { Metadata } from "next";
import { Cormorant_Garamond } from "next/font/google";
import { Inter } 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 inter = Inter({
variable: "--font-inter", subsets: ["latin"],
});
export const metadata: Metadata = {
@@ -31,7 +30,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={cormorantGaramond.variable}
className={inter.variable}
>
<Tag />
{children}
@@ -1257,4 +1256,4 @@ export default function RootLayout({
</ServiceWrapper>
</html>
);
}
}

2
src/app/page.tsx
View File

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