bender/3a5e57b5-9847-427b-b4b1-461bdb43b0d4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_5 into main

Browse Source 
Merge version_5 into main
This commit was merged in pull request #8.
This commit is contained in:
bender
2026-05-09 18:36:00 +00:00
parent 4c1d0af49f 133b4be6fa
commit cbff6ab7be
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/layout.tsx
View File

@@ -8,6 +8,7 @@ import Tag from "@/tag/Tag";
import { getVisualEditScript } from "@/utils/visual-edit-script"; import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Poppins } from "next/font/google"; import { Poppins } from "next/font/google";
import { Raleway } from "next/font/google"; import { Raleway } from "next/font/google";
import { Open_Sans } from "next/font/google";
@@ -22,8 +23,13 @@ export const metadata: Metadata = {
}; };
const raleway = Raleway({
variable: "--font-raleway", const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
const openSans = Open_Sans({
variable: "--font-open-sans",
subsets: ["latin"], subsets: ["latin"],
}); });
@@ -35,7 +41,7 @@ export default function RootLayout({
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body className={`${raleway.variable} antialiased`}> <body className={`${inter.variable} ${openSans.variable} antialiased`}>
<Tag /> <Tag />
{children} {children}
<script <script

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-raleway), sans-serif; font-family: var(--font-open-sans), 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-raleway), sans-serif; font-family: var(--font-inter), sans-serif;
} }