development/433023da-3941-4a7e-a26c-c9ec385559a2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #2

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

13
src/app/layout.tsx
View File

@@ -5,6 +5,8 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import { Open_Sans } from "next/font/google";
import { Work_Sans } from "next/font/google";
import { Montserrat } from "next/font/google";
import { Inter } from "next/font/google";
const interTight = Inter_Tight({
variable: "--font-inter-tight", subsets: ["latin"],
@@ -38,6 +40,15 @@ const workSans = Work_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<{
@@ -46,7 +57,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${openSans.variable} ${workSans.variable} antialiased`}>
<body 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-work-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-open-sans), sans-serif;
font-family: var(--font-montserrat), sans-serif;
}