Compare commits

..

4 Commits

Author SHA1 Message Date
3bcc8ddf2c Update theme fonts 2026-04-17 00:52:28 +00:00
1bc0a7e9c1 Update theme fonts 2026-04-17 00:52:28 +00:00
48bf559a33 Update src/app/page.tsx 2026-04-17 00:51:07 +00:00
d772581a6c Merge version_2 into main
Merge version_2 into main
2026-04-17 00:50:04 +00:00
3 changed files with 13 additions and 8 deletions

View File

@@ -7,6 +7,7 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
import { getVisualEditScript } from "@/utils/visual-edit-script"; import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Manrope } from "next/font/google"; import { Manrope } from "next/font/google";
import { DM_Sans } from "next/font/google"; import { DM_Sans } from "next/font/google";
import { Libre_Baskerville } from "next/font/google";
@@ -20,12 +21,14 @@ export const metadata: Metadata = {
}, },
}; };
const manrope = Manrope({
variable: "--font-manrope", const libreBaskerville = Libre_Baskerville({
variable: "--font-libre-baskerville",
subsets: ["latin"], subsets: ["latin"],
weight: ["400", "700"],
}); });
const dmSans = DM_Sans({ const inter = Inter({
variable: "--font-dm-sans", variable: "--font-inter",
subsets: ["latin"], subsets: ["latin"],
}); });
@@ -37,7 +40,7 @@ export default function RootLayout({
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body className={`${manrope.variable} ${dmSans.variable} antialiased`}> <body className={`${libreBaskerville.variable} ${inter.variable} antialiased`}>
{children} {children}
<script <script

View File

@@ -157,6 +157,8 @@ export default function LandingPage() {
faqs={[ faqs={[
{ {
id: "1", title: "Where are you located?", content: "7610 Milwaukee Ave Suite 300, Lubbock, TX"}, id: "1", title: "Where are you located?", content: "7610 Milwaukee Ave Suite 300, Lubbock, TX"},
{
id: "5", title: "What are your operating hours?", content: "We are open daily from 7:00 AM to 6:00 PM to serve your pastry cravings!"},
{ {
id: "2", title: "Do you offer catering?", content: "Yes, contact us for custom orders and bulk requests."}, id: "2", title: "Do you offer catering?", content: "Yes, contact us for custom orders and bulk requests."},
{ {
@@ -223,4 +225,4 @@ export default function LandingPage() {
</ReactLenis> </ReactLenis>
</ThemeProvider> </ThemeProvider>
); );
} }

View File

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