bender/6fc8aa77-3a0a-478f-848a-a9bb3c6b2fe2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_4 into main #12

Merged
bender merged 2 commits from version_4 into main 2026-04-16 21:19:08 +00:00
Conversation 0 Commits 2 Files Changed 2 +7 -9
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/layout.tsx
View File

@@ -11,6 +11,7 @@ import { Open_Sans } from "next/font/google";
import { Archivo } from "next/font/google";
import { DM_Sans } from "next/font/google";
import { Manrope } from "next/font/google";
import { Montserrat } from "next/font/google";
@@ -31,12 +32,9 @@ export const metadata: Metadata = {
const manrope = Manrope({
variable: "--font-manrope",
subsets: ["latin"],
});
const dmSans = DM_Sans({
variable: "--font-dm-sans",
const montserrat = Montserrat({
variable: "--font-montserrat",
subsets: ["latin"],
});
@@ -48,7 +46,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${manrope.variable} ${dmSans.variable} antialiased`}>
<body className={`${montserrat.variable} antialiased`}>
<Tag />
{children}
<script

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-dm-sans), sans-serif;
font-family: var(--font-montserrat), 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-montserrat), sans-serif;
}