development/f8e9a6a9-5d30-46da-b625-7b77f968463f
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge version_2 into main

Browse Source 
Merge version_2 into main
This commit was merged in pull request #1.
This commit is contained in:
development
2026-01-06 13:08:31 +00:00
parent ceff4e47bd b2ab106c06
commit a5c9347ba3
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/globals.css
View File

@@ -495,7 +495,7 @@ html {
body {
background-color: var(--background);
color: var(--foreground);
font-family: var(--font-inter-tight), sans-serif;
font-family: var(--font-playfair-display and --font-roboto), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -508,5 +508,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-inter-tight), sans-serif;
font-family: var(--font-playfair-display and --font-roboto), sans-serif;
}

18
src/app/layout.tsx
View File

@@ -1,13 +1,19 @@
import type { Metadata } from "next";
import { Inter_Tight } from "next/font/google";
import { Playfair_Display } from "next/font/google";
import { Roboto } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const interTight = Inter_Tight({
variable: "--font-inter-tight",
const playfairDisplay = Playfair_Display({
variable: "--font-playfair-display",
subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
});
const roboto = Roboto({
variable: "--font-roboto",
subsets: ["latin"],
weight: ["100", "300", "400", "500", "700", "900"],
});
export const metadata: Metadata = {
@@ -49,7 +55,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${interTight.variable} antialiased`}
className={`${playfairDisplay.variable} ${roboto.variable} antialiased`}
>
<Tag />
{children}
@@ -1275,4 +1281,4 @@ export default function RootLayout({
</ServiceWrapper>
</html>
);
}
}

4
src/app/page.tsx
View File

@@ -1,4 +1,4 @@
"use client"
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
@@ -409,4 +409,4 @@ export default function LandingPage() {
</div>
</ThemeProvider>
);
}
}