bender/5cf5f54d-9eb7-4e79-977b-c3b7af63a38e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_6 into main #5

Merged
bender merged 2 commits from version_6 into main 2026-02-10 23:01:56 +00:00
Conversation 0 Commits 2 Files Changed 2 +13 -2
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/layout.tsx
View File

@@ -6,6 +6,8 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import { DM_Sans } from "next/font/google";
import { Inter } from "next/font/google";
import { Plus_Jakarta_Sans } from "next/font/google";
import { Inter } from "next/font/google";
const workSans = Work_Sans({
variable: "--font-work-sans", subsets: ["latin"],
@@ -45,6 +47,15 @@ const inter = Inter({
subsets: ["latin"],
});
const plusJakartaSans = Plus_Jakarta_Sans({
variable: "--font-plus-jakarta-sans",
subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
export default function RootLayout({
children,
}: Readonly<{
@@ -53,7 +64,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${dmSans.variable} ${inter.variable} antialiased`}>
<body className={`${plusJakartaSans.variable} ${inter.variable} antialiased`}>
<Tag />
{children}

2
src/app/styles/base.css
View File

@@ -24,5 +24,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-dm-sans), sans-serif;
font-family: var(--font-plus-jakarta-sans), sans-serif;
}