development/7190e8d1-f60c-4207-b927-67fb4121f770
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_3 into main

Browse Source 
Merge version_3 into main
This commit was merged in pull request #7.
This commit is contained in:
development
2026-02-09 12:50:47 +00:00
parent 304b9c3845 b0fc442d12
commit 223efb2a3c
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/layout.tsx
View File

@@ -2,7 +2,7 @@ import type { Metadata } from "next";
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";
import { Public_Sans } from "next/font/google"; import { Mulish } from "next/font/google";
import { Inter } from "next/font/google"; import { Inter } from "next/font/google";
const montserrat = Montserrat({ const montserrat = Montserrat({
@@ -57,6 +57,15 @@ const inter = Inter({
subsets: ["latin"], subsets: ["latin"],
}); });
const mulish = Mulish({
variable: "--font-mulish",
subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
export default function RootLayout({ export default function RootLayout({
children, children,
}: Readonly<{ }: Readonly<{
@@ -66,7 +75,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body
className={`${publicSans.variable} ${inter.variable} antialiased`} ${sourceSans3.variable} {notoSans.variable`} {inter.variable}} antialiased`} className={`${mulish.variable} ${inter.variable} antialiased`} ${sourceSans3.variable} {notoSans.variable`} {inter.variable}} antialiased`}
> >
<Tag /> <Tag />
{children} {children}

2
src/app/styles/base.css
View File

@@ -24,5 +24,5 @@ h3,
h4, h4,
h5, h5,
h6 { h6 {
font-family: var(--font-public-sans), sans-serif; font-family: var(--font-mulish), sans-serif;
} }