bender/9d38f7f2-21f0-43e4-a2a8-b577fe9ddcf1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #10

Merged
bender merged 2 commits from version_1 into main 2026-03-03 00:47:54 +00:00
Conversation 0 Commits 2 Files Changed 2 +11 -5
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

@@ -7,6 +7,7 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import { Figtree } from "next/font/google";
import { Manrope } from "next/font/google";
import { Mulish } from "next/font/google";
@@ -29,8 +30,13 @@ export const metadata: Metadata = {
};
const manrope = Manrope({
variable: "--font-manrope",
const mulish = Mulish({
variable: "--font-mulish",
subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
@@ -42,7 +48,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${manrope.variable} antialiased`}>
<body className={`${mulish.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-manrope), 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-manrope), sans-serif;
font-family: var(--font-mulish), sans-serif;
}