development/624785bf-96b3-4437-85ec-4789639423dd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_4 into main #3

Merged
development merged 2 commits from version_4 into main 2025-12-27 15:26:32 +00:00
Conversation 0 Commits 2 Files Changed 2 +6 -6
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/layout.tsx
View File

@@ -1,13 +1,13 @@
import type { Metadata } from "next";
import { Poppins } from "next/font/google";
import { IBM_Plex_Sans } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const poppins = Poppins({
variable: "--font-poppins",
const ibmPlexSans = IBM_Plex_Sans({
variable: "--font-ibm-plex-sans",
subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
weight: ["100", "200", "300", "400", "500", "600", "700"],
});
export const metadata: Metadata = {
@@ -48,7 +48,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={poppins.variable}
className={ibmPlexSans.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 NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';