development/7190e8d1-f60c-4207-b927-67fb4121f770
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_3 into main #9

Merged
development merged 2 commits from version_3 into main 2026-02-09 13:09:05 +00:00
Conversation 0 Commits 2 Files Changed 2 +14 -5
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/layout.tsx
View File

@@ -2,8 +2,8 @@ import type { Metadata } from "next";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import { Manrope } from "next/font/google";
import { DM_Sans } from "next/font/google";
import { Montserrat } from "next/font/google";
import { Inter } from "next/font/google";
const montserrat = Montserrat({
variable: "--font-montserrat", subsets: ["latin"],
@@ -75,6 +75,15 @@ const dmSans = DM_Sans({
subsets: ["latin"],
});
const montserrat = Montserrat({
variable: "--font-montserrat",
subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
export default function RootLayout({
children,
}: Readonly<{
@@ -83,7 +92,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body ${inter.variable} antialiased`} ${sourceSans3.variable} {notoSans.variable`} {inter.variable}} antialiased`} className={`${manrope.variable} ${dmSans.variable} antialiased`}>
<body ${inter.variable} antialiased`} ${sourceSans3.variable} {notoSans.variable`} {inter.variable}} antialiased`} className={`${montserrat.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-dm-sans), 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-montserrat), sans-serif;
}