bender/8e69578b-95a4-42c6-b475-6dfdbbda5984
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #2

Merged
bender merged 2 commits from version_1 into main 2026-02-19 11:24:07 +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

@@ -4,6 +4,8 @@ import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import { Inter } from "next/font/google";
import { Plus_Jakarta_Sans } from "next/font/google";
import { Inter } from "next/font/google";
const sourceSans3 = Source_Sans_3({
variable: "--font-source-sans-3", subsets: ["latin"],
@@ -35,6 +37,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<{
@@ -43,7 +54,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${inter.variable} antialiased`}>
<body className={`${plusJakartaSans.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-family: --font-inter, sans-serif;), sans-serif;
font-family: var(--font-inter), sans-serif;), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
h4,
h5,
h6 {
font-family: var(font-family: --font-inter, sans-serif;), sans-serif;
font-family: var(--font-plus-jakarta-sans), sans-serif;), sans-serif;
}