development/1500b641-9c4f-41af-ade5-0f5952fb64f7
1
0
Fork 0
Code Issues Pull Requests 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
2025-12-29 22:35:23 +00:00
parent 36771e13bd c61c7c9ebe
commit 7117e39227
3 changed files with 7 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-merriweather), 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-merriweather), sans-serif;
font-family: var(--font-inter), sans-serif;
}

9
src/app/layout.tsx
View File

@@ -1,13 +1,12 @@
import type { Metadata } from "next";
import { Merriweather } from "next/font/google";
import { Inter } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const merriweather = Merriweather({
variable: "--font-merriweather",
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
weight: ["300", "400", "700", "900"],
});
export const metadata: Metadata = {
@@ -47,7 +46,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={merriweather.variable}
className={inter.variable}
>
<Tag />
{children}

2
src/app/page.tsx
View File

@@ -1,4 +1,4 @@
"use client"
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';