development/1037cfa6-1220-4959-b72b-25af27f8042e
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 2025-12-28 13:44:34 +00:00
Conversation 0 Commits 3 Files Changed 3 +9 -9
3 changed files with 9 additions and 9 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-inter), 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-inter), 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 { Inter } 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 inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
@@ -35,7 +35,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={plusJakartaSans.variable}
className={inter.variable}
>
<Tag />
{children}
@@ -1261,4 +1261,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';
@@ -138,4 +138,4 @@ export default function Page() {
</div>
</ThemeProvider>
);
}
}