Merge version_2 into main #1

Merged
development merged 3 commits from version_2 into main 2026-01-17 17:43:44 +00:00
Showing only changes of commit cf67dc6f47 - Show all commits

View File

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