Merge version_1 into main #2

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

View File

@@ -3,6 +3,7 @@ import { Raleway } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import { Figtree } from "next/font/google";
const raleway = Raleway({
variable: "--font-raleway", subsets: ["latin"],
@@ -27,6 +28,11 @@ export const metadata: Metadata = {
}
};
const figtree = Figtree({
variable: "--font-figtree",
subsets: ["latin"],
});
export default function RootLayout({
children,
}: Readonly<{
@@ -35,9 +41,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${raleway.variable} antialiased`}
>
<body className={`${figtree.variable} antialiased`}>
<Tag />
{children}

View File

@@ -11,7 +11,7 @@ html {
body {
background-color: var(--background);
color: var(--foreground);
font-family: var(--font-raleway), sans-serif;
font-family: var(--font-figtree), sans-serif;;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-raleway), sans-serif;
font-family: var(--font-figtree), sans-serif;;
}