development/1500b641-9c4f-41af-ade5-0f5952fb64f7
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: development:version_1
Branches Tags
development:main development:version_2 development:version_1
..
compare: development:version_2
Branches Tags
development:main development:version_2 development:version_1

3 Commits
version_1 ... version_2

Author SHA1 Message Date
development
c61c7c9ebe Update src/app/page.tsx 2025-12-29 22:35:19 +00:00
development
94b9360cfe Update src/app/layout.tsx 2025-12-29 22:35:18 +00:00
development
6bd36bc894 Update src/app/globals.css 2025-12-29 22:35:17 +00:00
3 changed files with 7 additions and 8 deletions
Expand all files Collapse all files

4
src/app/globals.css
View File

@@ -495,7 +495,7 @@ html {
body { body {
background-color: var(--background); background-color: var(--background);
color: var(--foreground); color: var(--foreground);
font-family: var(--font-merriweather), sans-serif; font-family: var(--font-inter), sans-serif;
position: relative; position: relative;
min-height: 100vh; min-height: 100vh;
overscroll-behavior: none; overscroll-behavior: none;
@@ -508,5 +508,5 @@ h3,
h4, h4,
h5, h5,
h6 { 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 type { Metadata } from "next";
import { Merriweather } from "next/font/google"; import { Inter } from "next/font/google";
import "./globals.css"; import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper"; import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag"; import Tag from "@/tag/Tag";
const merriweather = Merriweather({ const inter = Inter({
variable: "--font-merriweather", variable: "--font-inter",
subsets: ["latin"], subsets: ["latin"],
weight: ["300", "400", "700", "900"],
}); });
export const metadata: Metadata = { export const metadata: Metadata = {
@@ -47,7 +46,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body
className={merriweather.variable} className={inter.variable}
> >
<Tag /> <Tag />
{children} {children}

2
src/app/page.tsx
View File

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