Merge version_1 into main #1

Merged
development merged 2 commits from version_1 into main 2026-02-03 12:02:58 +00:00
2 changed files with 9 additions and 9 deletions

View File

@@ -17,7 +17,7 @@ export default function BlogPage() {
borderRadius="rounded" borderRadius="rounded"
contentWidth="small" contentWidth="small"
sizing="mediumSizeLargeTitles" sizing="mediumSizeLargeTitles"
background="aurora" background="none"
cardStyle="subtle-shadow" cardStyle="subtle-shadow"
primaryButtonStyle="diagonal-gradient" primaryButtonStyle="diagonal-gradient"
secondaryButtonStyle="solid" secondaryButtonStyle="solid"
@@ -60,23 +60,23 @@ export default function BlogPage() {
columns={[ columns={[
{ {
items: [ items: [
{ label: "Menu", id: "menu" }, { label: "Menu", href: "#menu" },
{ label: "Catering", href: "#contact" }, { label: "Catering", href: "#contact" },
{ label: "Gift Cards", href: "https://example.com/giftcards" } { label: "Gift Cards", href: "https://example.com/giftcards" }
] ]
}, },
{ {
items: [ items: [
{ label: "About Us", id: "about" }, { label: "About Us", href: "#about" },
{ label: "Our Story", id: "about" }, { label: "Our Story", href: "#about" },
{ label: "Sustainability", href: "https://example.com/sustainability" } { label: "Sustainability", href: "https://example.com/sustainability" }
] ]
}, },
{ {
items: [ items: [
{ label: "Contact", id: "contact" }, { label: "Contact", href: "#contact" },
{ label: "Location", href: "https://maps.google.com" }, { label: "Location", href: "https://maps.google.com" },
{ label: "Hours", id: "faq" } { label: "Hours", href: "#faq" }
] ]
}, },
{ {

View File

@@ -1,4 +1,4 @@
"use client" "use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider"; import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay'; import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
@@ -20,7 +20,7 @@ export default function LandingPage() {
borderRadius="rounded" borderRadius="rounded"
contentWidth="small" contentWidth="small"
sizing="mediumSizeLargeTitles" sizing="mediumSizeLargeTitles"
background="aurora" background="none"
cardStyle="subtle-shadow" cardStyle="subtle-shadow"
primaryButtonStyle="diagonal-gradient" primaryButtonStyle="diagonal-gradient"
secondaryButtonStyle="solid" secondaryButtonStyle="solid"
@@ -46,7 +46,7 @@ export default function LandingPage() {
<HeroBillboardGallery <HeroBillboardGallery
title="Your Morning Ritual Starts Here" title="Your Morning Ritual Starts Here"
description="Discover the perfect blend of premium specialty coffee and handcrafted pastries at Drink Morning. Experience the warmth, aroma, and excellence in every cup." description="Discover the perfect blend of premium specialty coffee and handcrafted pastries at Drink Morning. Experience the warmth, aroma, and excellence in every cup."
background={{ variant: "aurora" }} background={{ variant: "plain" }}
tag="Specialty Coffee" tag="Specialty Coffee"
tagIcon={Coffee} tagIcon={Coffee}
buttons={[ buttons={[