development/b2a22a55-57f5-48de-835f-e5585d65ed33
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #1

Merged
development merged 2 commits from version_1 into main 2026-02-09 13:18:39 +00:00
Conversation 0 Commits 2 Files Changed 2 +14 -6
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/app/layout.tsx
View File

@@ -1,8 +1,9 @@
import type { Metadata } from "next";
import { Work_Sans } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import { Noto_Sans } from "next/font/google";
import { Inter } from "next/font/google";
const workSans = Work_Sans({
variable: "--font-work-sans", subsets: ["latin"],
@@ -29,6 +30,15 @@ export const metadata: Metadata = {
}
};
const notoSans = Noto_Sans({
variable: "--font-noto-sans",
subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
export default function RootLayout({
children,
}: Readonly<{
@@ -37,9 +47,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${workSans.variable} antialiased`}
>
<body className={`${notoSans.variable} ${inter.variable} antialiased`}>
<Tag />
{children}

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

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