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

Compare commits

merge into: development:version_3
Branches Tags
development:main development:version_4 development:version_3 development:version_2 development:version_1
...
pull from: development:main
Branches Tags
development:main development:version_4 development:version_3 development:version_2 development:version_1

6 Commits
version_3 ... main

Author SHA1 Message Date
development
759aac567a Merge version_4 into main 
Merge version_4 into main
 2026-01-25 15:09:44 +00:00
development
8133d04c16 Update src/app/page.tsx 2026-01-25 15:09:39 +00:00
development
4bc117e19c Update src/app/layout.tsx 2026-01-25 15:09:39 +00:00
development
41b3af69b4 Update src/app/globals.css 2026-01-25 15:09:38 +00:00
development
06cba6e606 Merge version_3 into main 
Merge version_3 into main
 2026-01-25 15:02:12 +00:00
development
1a1be45d1a Merge version_2 into main 
Merge version_2 into main
 2026-01-25 13:51:46 +00:00
3 changed files with 8 additions and 9 deletions
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;
}

9
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}