Merge version_1 into main #8

Merged
bender merged 2 commits from version_1 into main 2026-02-19 12:38:12 +00:00
2 changed files with 9 additions and 3 deletions

View File

@@ -5,6 +5,7 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import { Instrument_Sans } from "next/font/google";
import { Figtree } from "next/font/google";
import { Karla } from "next/font/google";
const outfit = Outfit({
variable: "--font-outfit", subsets: ["latin"],
@@ -57,6 +58,11 @@ const figtree = Figtree({
subsets: ["latin"],
});
const karla = Karla({
variable: "--font-karla",
subsets: ["latin"],
});
export default function RootLayout({
children,
}: Readonly<{
@@ -65,7 +71,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${figtree.variable} antialiased`}>
<body className={`${karla.variable} antialiased`}>
<Tag />
{children}

View File

@@ -11,7 +11,7 @@ html {
body {
background-color: var(--background);
color: var(--foreground);
font-family: var(font-family: --font-instrument-sans, sans-serif;), sans-serif;
font-family: font-family: var(--font-karla), 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-instrument-sans, sans-serif;), sans-serif;
font-family: font-family: var(--font-karla), sans-serif;), sans-serif;
}