bender/d99373dc-e84f-4a8f-84c6-397d1dc09af3
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #2

Merged
bender merged 3 commits from version_2 into main 2026-03-04 10:58:27 +00:00
Conversation 0 Commits 3 Files Changed 3 +5 -16
3 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/layout.tsx
View File

@@ -1,20 +1,9 @@
import type { Metadata } from "next";
import { Nunito_Sans } from "next/font/google";
import { Halant } from "next/font/google";
import { Inter } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const nunitoSans = Nunito_Sans({
variable: "--font-nunito-sans", subsets: ["latin"],
});
const halant = Halant({
variable: "--font-halant", subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
});
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
});
@@ -37,7 +26,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${nunitoSans.variable} ${halant.variable} ${inter.variable} antialiased`}
className={`${inter.variable} antialiased`}
>
<Tag />
{children}
@@ -1412,4 +1401,4 @@ export default function RootLayout({
</ServiceWrapper>
</html>
);
}
}

2
src/app/page.tsx
View File

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

4
src/app/styles/base.css
View File

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