Merge version_6 into main #12

Merged
bender merged 2 commits from version_6 into main 2026-05-06 19:08:04 +00:00
2 changed files with 6 additions and 6 deletions

View File

@@ -21,10 +21,10 @@ export const metadata: Metadata = {
};
const roboto = Roboto({
variable: "--font-roboto",
const publicSans = Public_Sans({
variable: "--font-public-sans",
subsets: ["latin"],
weight: ["100", "300", "400", "500", "700", "900"],
});
export default function RootLayout({
@@ -35,7 +35,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${roboto.variable} antialiased`}>
<body className={`${publicSans.variable} antialiased`}>
{children}
<script

View File

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