Merge version_2 into main #2

Merged
bender merged 3 commits from version_2 into main 2026-03-21 00:07:49 +00:00
3 changed files with 9 additions and 7 deletions

View File

@@ -6,6 +6,7 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Roboto } from "next/font/google";
import { Fredoka_Condensed } from "next/font/google";
@@ -14,9 +15,10 @@ export const metadata: Metadata = {
description: 'Transformative ranch programs for urban youth. Build leadership, confidence, and responsibility through hands-on horse experiences. Book your group experience today.',
};
const roboto = Roboto({
variable: "--font-roboto", subsets: ["latin"],
weight: ["100", "300", "400", "500", "700", "900"],
const fredokaCondensed = Fredoka_Condensed({
variable: "--font-fredoka-condensed", subsets: ["latin"],
weight: ["400", "500", "600", "700"],
});
export default function RootLayout({
@@ -27,7 +29,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${roboto.variable} antialiased`}>
<body className={`${fredokaCondensed.variable} antialiased`}>
<Tag />
{children}
<script

View File

@@ -226,4 +226,4 @@ export default function LandingPage() {
</div>
</ThemeProvider>
);
}
}

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-fredoka-condensed), 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-fredoka-condensed), sans-serif;
}