bender/d780a2df-2a80-4853-9a36-b1e1a724541e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #14

Merged
bender merged 2 commits from version_1 into main 2026-02-15 12:54:30 +00:00
Conversation 0 Commits 2 Files Changed 2 +15 -3
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/layout.tsx
View File

@@ -24,6 +24,8 @@ import { Mulish } from "next/font/google";
import { Inter } from "next/font/google";
import { Manrope } from "next/font/google";
import { Public_Sans } from "next/font/google";
import { Josefin_Sans } from "next/font/google";
import { Inter } from "next/font/google";
const manrope = Manrope({
variable: "--font-manrope", subsets: ["latin"],
@@ -147,6 +149,16 @@ const publicSans = Public_Sans({
subsets: ["latin"],
});
const josefinSans = Josefin_Sans({
variable: "--font-josefin-sans",
subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
export default function RootLayout({
children,
}: Readonly<{
@@ -155,7 +167,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${publicSans.variable} antialiased`}>
<body className={`${josefinSans.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-manrope, sans-serif;), sans-serif;), sans-serif;), sans-serif;
font-family: var(--font-inter), sans-serif;), sans-serif;), 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-manrope, sans-serif;), sans-serif;), sans-serif;), sans-serif;
font-family: var(--font-josefin-sans), sans-serif;), sans-serif;), sans-serif;), sans-serif;
}