bender/d780a2df-2a80-4853-9a36-b1e1a724541e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main

Browse Source 
Merge version_1 into main
This commit was merged in pull request #10.
This commit is contained in:
bender
2026-02-15 12:47:50 +00:00
parent 2c0d79f023 13a06280fc
commit c0aa74eeea
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/layout.tsx
View File

@@ -19,6 +19,7 @@ import { Inter } from "next/font/google";
import { Open_Sans } from "next/font/google"; import { Open_Sans } from "next/font/google";
import { Plus_Jakarta_Sans } from "next/font/google"; import { Plus_Jakarta_Sans } from "next/font/google";
import { Inter } from "next/font/google"; import { Inter } from "next/font/google";
import { Noto_Sans } from "next/font/google";
const manrope = Manrope({ const manrope = Manrope({
variable: "--font-manrope", subsets: ["latin"], variable: "--font-manrope", subsets: ["latin"],
@@ -118,6 +119,11 @@ const inter = Inter({
subsets: ["latin"], subsets: ["latin"],
}); });
const notoSans = Noto_Sans({
variable: "--font-noto-sans",
subsets: ["latin"],
});
export default function RootLayout({ export default function RootLayout({
children, children,
}: Readonly<{ }: Readonly<{
@@ -126,7 +132,7 @@ export default function RootLayout({
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body className={`${plusJakartaSans.variable} ${inter.variable} antialiased`}> <body className={`${notoSans.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-inter), sans-serif;), sans-serif; font-family: var(font-family: --font-noto-sans, sans-serif;), sans-serif;), 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-plus-jakarta-sans), sans-serif;), sans-serif; font-family: var(font-family: --font-noto-sans, sans-serif;), sans-serif;), sans-serif;
} }