bender/cd53fd88-8d74-473e-84ee-77c9b9389e4c
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 12:01:50 +00:00
Conversation 0 Commits 2 Files Changed 2 +9 -5
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/layout.tsx
View File

@@ -3,6 +3,7 @@ import { Outfit } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import { Instrument_Sans } from "next/font/google";
const outfit = Outfit({
variable: "--font-outfit", subsets: ["latin"],
@@ -25,6 +26,11 @@ export const metadata: Metadata = {
},
};
const instrumentSans = Instrument_Sans({
variable: "--font-instrument-sans",
subsets: ["latin"],
});
export default function RootLayout({
children,
}: Readonly<{
@@ -33,9 +39,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${outfit.variable} antialiased`}
>
<body className={`${instrumentSans.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-outfit), sans-serif;
font-family: var(font-family: --font-instrument-sans, sans-serif;), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-outfit), sans-serif;
font-family: var(font-family: --font-instrument-sans, sans-serif;), sans-serif;
}