development/dd44897a-3421-439a-8f21-55b66595e1c0
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Merge version_5 into main #4

Merged
development merged 3 commits from version_5 into main 2026-01-04 19:05:42 +00:00
Conversation 0 Commits 3 Files Changed 3 +8 -8
3 changed files with 8 additions and 8 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-plus-jakarta-sans), sans-serif;
font-family: var(--font-fraunces), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -508,5 +508,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-plus-jakarta-sans), sans-serif;
font-family: var(--font-fraunces), sans-serif;
}

10
src/app/layout.tsx
View File

@@ -1,11 +1,11 @@
import type { Metadata } from "next";
import { Plus_Jakarta_Sans } from "next/font/google";
import { Fraunces } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const plusJakartaSans = Plus_Jakarta_Sans({
variable: "--font-plus-jakarta-sans",
const fraunces = Fraunces({
variable: "--font-fraunces",
subsets: ["latin"],
});
@@ -43,7 +43,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={plusJakartaSans.variable}
className={fraunces.variable}
>
<Tag />
{children}
@@ -1269,4 +1269,4 @@ export default function RootLayout({
</ServiceWrapper>
</html>
);
}
}

2
src/app/page.tsx
View File

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