Update src/app/page.tsx

Merge version_8 into main
2026-06-05 12:57:40 +00:00 · 2026-06-05 12:55:53 +00:00 · 2026-06-05 12:55:50 +00:00 · 2026-06-05 12:55:49 +00:00 · 2026-06-05 12:55:45 +00:00 · 2026-06-05 12:50:55 +00:00
4 changed files with 39 additions and 32 deletions
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -7,6 +7,7 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
 import Tag from "@/tag/Tag";
 import { getVisualEditScript } from "@/utils/visual-edit-script";
 import { Montserrat } from "next/font/google";
+import { Libre_Baskerville } from "next/font/google";



@@ -41,8 +42,14 @@ export const metadata: Metadata = {
  },
 };

-const montserrat = Montserrat({
-  variable: "--font-montserrat",
+
+const libreBaskerville = Libre_Baskerville({
+  variable: "--font-libre-baskerville",
+  subsets: ["latin"],
+  weight: ["400", "700"],
+});
+const inter = Inter({
+  variable: "--font-inter",
  subsets: ["latin"],
 });

@@ -54,7 +61,7 @@ export default function RootLayout({
  return (
    <html lang="en" suppressHydrationWarning>
      <ServiceWrapper>
-        <body className={`${montserrat.variable} antialiased`}>
+        <body className={`${libreBaskerville.variable} ${inter.variable} antialiased`}>
          <Tag />
          {children}
          <script
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -43,7 +43,7 @@ export default function LandingPage() {
        {
          name: "Testimonials",          id: "#testimonials"},
        {
-          name: "Contact",          id: "#contact"},
+          name: "Contact",          id: "#contact"}
      ]}
      logoSrc="http://img.b2bpic.net/free-vector/coffee-shop-logo-food-business-template-branding-design-vector-coffee-kind-made-with-love-text_53876-140606.jpg"
      logoAlt="Rehla Coffee House Logo"
@@ -69,29 +69,29 @@ export default function LandingPage() {
        {
          src: "http://img.b2bpic.net/free-photo/aged-teacher-drinking-classroom_23-2148201041.jpg",          alt: "Smiling visitor"},
        {
-          src: "http://img.b2bpic.net/free-photo/cup-with-milk-foam-christmas-tree-cinnamon-held-woman-s-arms_1304-3355.jpg",          alt: "Cup with milk foam and Christmas tree of cinnamon held in woman's arms"},
+          src: "http://img.b2bpic.net/free-photo/cup-with-milk-foam-christmas-tree-cinnamon-held-woman-s-arms_1304-3355.jpg",          alt: "Cup with milk foam and Christmas tree of cinnamon held in woman's arms"}
      ]}
      avatarText="Join our community of coffee enthusiasts."
      buttons={[
        {
          text: "View Menu",          href: "#menu"},
        {
-          text: "Visit Us",          href: "#contact"},
+          text: "Visit Us",          href: "#contact"}
      ]}
      buttonAnimation="slide-up"
      marqueeItems={[
        {
          type: "text",          text: "Premium Brews"},
        {
-          type: "text-icon",          text: "Cozy Atmosphere",          icon: Coffee,
+          type: "text-icon",          text: "Cozy Atmosphere",          icon: Coffee
        },
        {
          type: "text",          text: "Fresh Pastries"},
        {
-          type: "text-icon",          text: "Free Wi-Fi",          icon: Sparkles,
+          type: "text-icon",          text: "Free Wi-Fi",          icon: Sparkles
        },
        {
-          type: "text",          text: "Community Vibes"},
+          type: "text",          text: "Community Vibes"}
      ]}
      marqueeSpeed={30}
      showMarqueeCard={true}
@@ -121,7 +121,7 @@ export default function LandingPage() {
            {
              imageSrc: "http://img.b2bpic.net/free-photo/front-view-coffee-glass-book_23-2148453642.jpg",              imageAlt: "Espresso shot"},
            {
-              imageSrc: "http://img.b2bpic.net/free-photo/symbol-plus-minus-made-from-coffee-beans-isolated-white-background_169016-52946.jpg",              imageAlt: "Coffee beans"},
+              imageSrc: "http://img.b2bpic.net/free-photo/symbol-plus-minus-made-from-coffee-beans-isolated-white-background_169016-52946.jpg",              imageAlt: "Coffee beans"}
          ]
        },
        {
@@ -130,7 +130,7 @@ export default function LandingPage() {
            {
              imageSrc: "http://img.b2bpic.net/free-photo/ice-falling-into-glass-with-brown-drink_1194-1150.jpg",              imageAlt: "Iced coffee"},
            {
-              imageSrc: "http://img.b2bpic.net/free-photo/latte-coffee_74190-7857.jpg",              imageAlt: "Latte art"},
+              imageSrc: "http://img.b2bpic.net/free-photo/latte-coffee_74190-7857.jpg",              imageAlt: "Latte art"}
          ]
        },
        {
@@ -139,7 +139,7 @@ export default function LandingPage() {
            {
              imageSrc: "http://img.b2bpic.net/free-photo/chocolate-doughnuts-black-surface-stone-board_114579-17439.jpg",              imageAlt: "Croissant"},
            {
-              imageSrc: "http://img.b2bpic.net/free-photo/top-close-view-little-delicious-cake-along-with-sweet-banhles-dark-desk_140725-32687.jpg",              imageAlt: "Croissant icon"},
+              imageSrc: "http://img.b2bpic.net/free-photo/top-close-view-little-delicious-cake-along-with-sweet-banhles-dark-desk_140725-32687.jpg",              imageAlt: "Croissant icon"}
          ]
        }
      ]}
@@ -173,7 +173,7 @@ export default function LandingPage() {
          reviewCount: "78",          imageSrc: "http://img.b2bpic.net/free-photo/matcha-latte-with-whipped-cream-lime_23-2151986812.jpg",          imageAlt: "An iced matcha drink"},
        {
          id: "croissant",          brand: "Baked Fresh",          name: "Butter Croissant",          price: "$3.75",          rating: 5,
-          reviewCount: "110",          imageSrc: "http://img.b2bpic.net/free-photo/close-up-view-poppy-seeds-bagel-oat-background_141793-5270.jpg",          imageAlt: "A flaky butter croissant"},
+          reviewCount: "110",          imageSrc: "http://img.b2bpic.net/free-photo/close-up-view-poppy-seeds-bagel-oat-background_141793-5270.jpg",          imageAlt: "A flaky butter croissant"}
      ]}
      title="Our Full Menu"
      description="From classic espressos to unique seasonal delights, and a selection of freshly baked goods to savor."
@@ -210,7 +210,7 @@ export default function LandingPage() {
        {
          src: "http://img.b2bpic.net/free-photo/portrait-bearded-redhead-casual-man-drinks-coffee-cafe-street_613910-1968.jpg",          alt: "David C."},
        {
-          src: "http://img.b2bpic.net/free-photo/person-using-nfc-technology-pay-bill-restaurant_23-2150039430.jpg",          alt: "Jessica M."},
+          src: "http://img.b2bpic.net/free-photo/person-using-nfc-technology-pay-bill-restaurant_23-2150039430.jpg",          alt: "Jessica M."}
      ]}
      ratingAnimation="blur-reveal"
      avatarsAnimation="slide-up"
@@ -227,7 +227,7 @@ export default function LandingPage() {
        {
          id: "hours",          title: "What are your opening hours?",          content: "We are open Monday-Friday: 7 AM - 6 PM, Saturday: 8 AM - 7 PM, and Sunday: 9 AM - 5 PM."},
        {
-          id: "seating",          title: "Is your space suitable for studying or remote work?",          content: "Absolutely! We have comfortable seating, ample power outlets, and a quiet ambiance perfect for focus and productivity."},
+          id: "seating",          title: "Is your space suitable for studying or remote work?",          content: "Absolutely! We have comfortable seating, ample power outlets, and a quiet ambiance perfect for focus and productivity."}
      ]}
      imageSrc="http://img.b2bpic.net/free-photo/man-preparing-coffee-coffee-machine_107420-84959.jpg"
      imageAlt="Professional coffee machine"
@@ -252,7 +252,7 @@ export default function LandingPage() {
        {
          text: "Get Directions",          href: "https://www.google.com/maps/dir/?api=1&destination=117+W+4th+St,+Royal+Oak,+MI+48067"},
        {
-          text: "Call Us",          href: "tel:+1248-555-1234"},
+          text: "Call Us",          href: "tel:+1248-555-1234"}
      ]}
      buttonAnimation="slide-up"
    />
@@ -273,8 +273,8 @@ export default function LandingPage() {
            {
              label: "Menu",              href: "#menu"},
            {
-              label: "Gallery",              href: "#gallery"},
-          ],
+              label: "Gallery",              href: "#gallery"}
+          ]
        },
        {
          title: "Connect",          items: [
@@ -285,9 +285,9 @@ export default function LandingPage() {
            {
              label: "Instagram",              href: "https://instagram.com/rehlacoffee"},
            {
-              label: "Privacy Policy",              href: "#"},
-          ],
-        },
+              label: "Privacy Policy",              href: "#"}
+          ]
+        }
      ]}
      copyrightText="© 2024 Rehla Coffee House. All rights reserved."
    />
--- a/src/app/styles/base.css
+++ b/src/app/styles/base.css
@@ -11,7 +11,7 @@ html {
 body {
  background-color: var(--background);
  color: var(--foreground);
-  font-family: var(--font-montserrat), sans-serif;
+  font-family: var(--font-inter), sans-serif;
  position: relative;
  min-height: 100vh;
  overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
 h4,
 h5,
 h6 {
-  font-family: var(--font-montserrat), sans-serif;
+  font-family: var(--font-libre-baskerville), serif;
 }
--- a/src/app/styles/variables.css
+++ b/src/app/styles/variables.css
@@ -10,15 +10,15 @@
  --accent: #ffffff;
  --background-accent: #ffffff; */

-  --background: #F5F1EA;
-  --card: #D6C7B2;
-  --foreground: #3B2F2F;
-  --primary-cta: #C8A45D;
-  --primary-cta-text: #3B2F2F;
-  --secondary-cta: #3B2F2F;
-  --secondary-cta-text: #F5F1EA;
-  --accent: #C8A45D;
-  --background-accent: #D6C7B2;
+  --background: #f5f5f5;
+  --card: #ffffff;
+  --foreground: #1c1c1c;
+  --primary-cta: #511f1f;
+  --primary-cta-text: #f5f5f5;
+  --secondary-cta: #ffffff;
+  --secondary-cta-text: #1c1c1c;
+  --accent: #8f3838;
+  --background-accent: #c9725c;

  /* text sizing - set by ThemeProvider */
  /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
Author	SHA1	Message	Date
bender	7829bed758	Update src/app/page.tsx	2026-06-05 12:57:40 +00:00
bender	7b2e393e0a	Merge version_8 into main Merge version_8 into main	2026-06-05 12:55:53 +00:00
bender	7ef7ea6932	Update theme colors	2026-06-05 12:55:50 +00:00
bender	2721e08101	Merge version_7 into main Merge version_7 into main	2026-06-05 12:55:49 +00:00
bender	2a637b0e34	Update theme colors	2026-06-05 12:55:45 +00:00
bender	8c7ace187c	Merge version_6 into main Merge version_6 into main	2026-06-05 12:50:55 +00:00
bender	c5dc00066e	Update theme colors	2026-06-05 12:50:52 +00:00
bender	195ef210d4	Merge version_5 into main Merge version_5 into main	2026-06-05 12:50:52 +00:00
bender	6f857fe328	Update theme colors	2026-06-05 12:50:49 +00:00
bender	7209c69a7d	Merge version_4 into main Merge version_4 into main	2026-06-05 12:50:48 +00:00
bender	c0ba937333	Update theme colors	2026-06-05 12:50:45 +00:00
bender	34d4e0cb15	Merge version_3 into main Merge version_3 into main	2026-06-05 12:50:34 +00:00
bender	ff8a01920d	Update theme colors	2026-06-05 12:50:31 +00:00
bender	54a70321ca	Merge version_2 into main Merge version_2 into main	2026-06-05 12:50:14 +00:00
bender	52f77c4835	Update theme fonts	2026-06-05 12:50:11 +00:00
bender	9243a9ad40	Update theme fonts	2026-06-05 12:50:10 +00:00
bender	700a1e4a36	Merge version_2 into main Merge version_2 into main	2026-06-05 12:50:08 +00:00
bender	db067a8855	Update theme colors	2026-06-05 12:50:05 +00:00
bender	2d1062aba8	Merge version_1 into main Merge version_1 into main	2026-06-05 12:45:05 +00:00
bender	c800e238d0	Merge version_1 into main Merge version_1 into main	2026-06-05 12:44:12 +00:00