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

Merge version_2 into main #1

Merged
development merged 3 commits from version_2 into main 2026-01-17 17:43:44 +00:00
Conversation 0 Commits 3 Files Changed 3 +5 -4
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cf67dc6f47 - Show all commits

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}