Merge version_2 into main #6

Merged
bender merged 2 commits from version_2 into main 2026-02-20 21:30:17 +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 { Libre_Baskerville } from "next/font/google";
import { Inter } from "next/font/google";
import { Raleway } from "next/font/google";
const mulish = Mulish({
variable: "--font-mulish", subsets: ["latin"],
@@ -36,6 +37,11 @@ const inter = Inter({
subsets: ["latin"],
});
const raleway = Raleway({
variable: "--font-raleway",
subsets: ["latin"],
});
export default function RootLayout({
children,
}: Readonly<{
@@ -44,7 +50,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${libreBaskerville.variable} ${inter.variable} antialiased`}>
<body className={`${raleway.variable} antialiased`}>
<Tag />
{children}

View File

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