bender/07638a8c-c29d-41b2-ae55-7a18df783c49
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #5

Merged
bender merged 2 commits from version_1 into main 2026-02-20 17:07:47 +00:00
Conversation 0 Commits 2 Files Changed 2 +13 -3
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/layout.tsx
View File

@@ -1,6 +1,7 @@
import type { Metadata } from "next";
import { Open_Sans } from "next/font/google";
import { Work_Sans } from "next/font/google";
import { Source_Sans_3 } from "next/font/google";
import "./globals.css";
const openSans = Open_Sans({
@@ -31,6 +32,15 @@ export const metadata: Metadata = {
},
};
const workSans = Work_Sans({
variable: "--font-work-sans",
subsets: ["latin"],
});
const sourceSans3 = Source_Sans_3({
variable: "--font-source-sans-3",
subsets: ["latin"],
});
export default function RootLayout({
children,
}: Readonly<{
@@ -38,7 +48,7 @@ export default function RootLayout({
}>) {
return (
<html lang="en">
<body className={`${openSans.variable} ${workSans.variable} antialiased`}>
<body className={`${workSans.variable} ${sourceSans3.variable} antialiased`}>
{children}
<script

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-source-sans-3), 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-work-sans), sans-serif;
}