bender/ef79a754-b64f-4b5d-b758-02901127c73e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #3

Merged
bender merged 2 commits from version_2 into main 2026-03-21 00:09:54 +00:00
Conversation 0 Commits 2 Files Changed 2 +11 -13
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/app/layout.tsx
View File

@@ -1,24 +1,22 @@
import type { Metadata } from "next";
import { Halant } from "next/font/google";
import { Inter } from "next/font/google";
import { Fredoka } from "next/font/google";
import { Sora } from "next/font/google";
import "./globals.css";
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";
export const metadata: Metadata = {
title: 'Rising Saddle Ranch | Urban Youth Ranch Experiences',
description: 'Transformative ranch programs for urban youth. Build leadership, confidence, and responsibility through hands-on horse experiences. Book your group experience today.',
};
const fredoka = Fredoka({
variable: "--font-fredoka", subsets: ["latin"],
});
const fredokaCondensed = Fredoka_Condensed({
variable: "--font-fredoka-condensed", subsets: ["latin"],
weight: ["400", "500", "600", "700"],
const sora = Sora({
variable: "--font-sora", subsets: ["latin"],
});
export default function RootLayout({
@@ -29,7 +27,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${fredokaCondensed.variable} antialiased`}>
<body className={`${fredoka.variable} ${sora.variable} antialiased`}>
<Tag />
{children}
<script
@@ -41,4 +39,4 @@ export default function RootLayout({
</ServiceWrapper>
</html>
);
}
}

4
src/app/styles/base.css
View File

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