development/9d9cfb30-cc09-49c0-8fb8-e6656bac1482
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: development:version_1
Branches Tags
development:main development:version_3 development:version_2 development:version_1
...
pull from: development:version_2
Branches Tags
development:main development:version_3 development:version_2 development:version_1

3 Commits
version_1 ... version_2

Author SHA1 Message Date
development
f444cecfc9 Update src/app/page.tsx 2026-01-17 17:43:39 +00:00
development
cf67dc6f47 Update src/app/layout.tsx 2026-01-17 17:43:38 +00:00
development
c6275514ae Update src/app/globals.css 2026-01-17 17:43:37 +00:00
3 changed files with 8 additions and 7 deletions
Expand all files Collapse all files

4
src/app/globals.css
View File

@@ -509,7 +509,7 @@ html {
body { body {
background-color: var(--background); background-color: var(--background);
color: var(--foreground); color: var(--foreground);
font-family: var(--font-fira-code), sans-serif; font-family: var(--font-poppins), sans-serif;
position: relative; position: relative;
min-height: 100vh; min-height: 100vh;
overscroll-behavior: none; overscroll-behavior: none;
@@ -522,5 +522,5 @@ h3,
h4, h4,
h5, h5,
h6 { h6 {
font-family: var(--font-fira-code), sans-serif; font-family: var(--font-poppins), sans-serif;
} }

9
src/app/layout.tsx
View File

@@ -1,11 +1,12 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Fira_Code } from "next/font/google"; import { Poppins } 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 firaCode = Fira_Code({ const poppins = Poppins({
variable: "--font-fira-code", subsets: ["latin"], variable: "--font-poppins", subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
}); });
export const metadata: Metadata = { export const metadata: Metadata = {
@@ -36,7 +37,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body
className={firaCode.variable} className={poppins.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 NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen'; import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';