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 #6.
This commit is contained in:
development
2026-02-09 12:45:11 +00:00
parent 689043ac8d 1db4d730ef
commit 304b9c3845
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/layout.tsx
View File

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

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

@@ -11,7 +11,7 @@ html {
body { body {
background-color: var(--background); background-color: var(--background);
color: var(--foreground); color: var(--foreground);
font-family: var(--font-source-sans-3), sans-serif; font-family: var(--font-inter), sans-serif;
position: relative; position: relative;
min-height: 100vh; min-height: 100vh;
overscroll-behavior: none; overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
h4, h4,
h5, h5,
h6 { h6 {
font-family: var(--font-work-sans), sans-serif; font-family: var(--font-public-sans), sans-serif;
} }