Merge version_3 into main #12

Merged
bender merged 4 commits from version_3 into main 2026-06-06 14:25:37 +00:00
2 changed files with 9 additions and 5 deletions

View File

@@ -9,6 +9,8 @@ import { Source_Sans_3 } from "next/font/google";
import { Open_Sans } from "next/font/google";
import { Montserrat } from "next/font/google";
import { Mulish } from "next/font/google";
import { Archivo } from "next/font/google";
import { Raleway } from "next/font/google";
@@ -46,8 +48,10 @@ export const metadata: Metadata = {
const mulish = Mulish({
variable: "--font-mulish",
const raleway = Raleway({
variable: "--font-raleway",
subsets: ["latin"],
});
@@ -59,7 +63,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${mulish.variable} antialiased`}>
<body className={`${raleway.variable} antialiased`}>
{children}
<script

View File

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