development/dd44897a-3421-439a-8f21-55b66595e1c0
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Merge version_5 into main #4

Merged
development merged 3 commits from version_5 into main 2026-01-04 19:05:42 +00:00
Conversation 0 Commits 3 Files Changed 3 +5 -5
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e05f540ce5 - Show all commits

8
src/app/layout.tsx
View File

@@ -1,11 +1,11 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Plus_Jakarta_Sans } from "next/font/google"; import { Fraunces } 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 plusJakartaSans = Plus_Jakarta_Sans({ const fraunces = Fraunces({
variable: "--font-plus-jakarta-sans", variable: "--font-fraunces",
subsets: ["latin"], subsets: ["latin"],
}); });
@@ -43,7 +43,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body
className={plusJakartaSans.variable} className={fraunces.variable}
> >
<Tag /> <Tag />
{children} {children}