development/b5721454-5bc5-4d47-93de-c7329e369326
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_6 into main #5

Merged
development merged 2 commits from version_6 into main 2025-12-29 22:12:29 +00:00
Conversation 0 Commits 2 Files Changed 2 +4 -4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6352309040 - 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 { Lora } from "next/font/google"; import { Inter } 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 lora = Lora({ const inter = Inter({
variable: "--font-lora", variable: "--font-inter",
subsets: ["latin"], subsets: ["latin"],
}); });
@@ -44,7 +44,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body
className={lora.variable} className={inter.variable}
> >
<Tag /> <Tag />
{children} {children}