bender/b93865eb-be50-4c0b-9061-95e92372bdba
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #6

Merged
bender merged 2 commits from version_2 into main 2026-02-20 22:15:27 +00:00
Conversation 0 Commits 2 Files Changed 2 +12 -4
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/layout.tsx
View File

@@ -3,6 +3,7 @@ import { Inter } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import { Open_Sans } from "next/font/google";
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
@@ -27,6 +28,15 @@ export const metadata: Metadata = {
}
};
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
const openSans = Open_Sans({
variable: "--font-open-sans",
subsets: ["latin"],
});
export default function RootLayout({
children,
}: Readonly<{
@@ -35,9 +45,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${inter.variable} antialiased`}
>
<body className={`${inter.variable} ${openSans.variable} antialiased`}>
<Tag />
{children}

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

@@ -11,7 +11,7 @@ html {
body {
background-color: var(--background);
color: var(--foreground);
font-family: var(--font-inter), sans-serif;
font-family: var(--font-open-sans), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;