development/0c87e76b-fbb4-438a-96d4-63a04a1164d3
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge version_3 into main

Browse Source 
Merge version_3 into main
This commit was merged in pull request #2.
This commit is contained in:
development
2026-01-13 12:47:11 +00:00
parent 73f26dfd1d 631d4b93e3
commit 73a087a92e
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/app/globals.css
View File

@@ -4,21 +4,21 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #f5f5f5;;
/* --background: #1a1a1a;;
--card: #ffffff;;
--foreground: #1c1c1c;;
--primary-cta: #6139e6;;
--secondary-cta: #ffffff;;
--accent: #6139e6;;
--background-accent: #b3a8e8;; */
--foreground: #ffe6e6;;
--primary-cta: #ff3d4a;;
--secondary-cta: #1f0a0a;;
--accent: #7b2d2d;;
--background-accent: #b8111f;; */
--background: #f5f5f5;;
--background: #1a1a1a;;
--card: #ffffff;;
--foreground: #1c1c1c;;
--primary-cta: #6139e6;;
--secondary-cta: #ffffff;;
--accent: #6139e6;;
--background-accent: #b3a8e8;;
--foreground: #ffe6e6;;
--primary-cta: #ff3d4a;;
--secondary-cta: #1f0a0a;;
--accent: #7b2d2d;;
--background-accent: #b8111f;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);

2
src/app/layout.tsx
View File

@@ -1260,4 +1260,4 @@ export default function RootLayout({
</ServiceWrapper>
</html>
);
}
}

6
src/app/page.tsx
View File

@@ -1,4 +1,4 @@
"use client"
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
@@ -192,7 +192,7 @@ export default function LandingPage() {
id: "4", title: "What payment methods do you accept?", content: "We accept all major credit cards (Visa, Mastercard, American Express), PayPal, bank transfers, and cash on delivery for local orders. All transactions are secure and encrypted."
},
{
id: "5", title: "What if I'm not satisfied with my order?", content: "Your satisfaction is our priority. If you're not happy with your flowers or arrangement, please contact us within 24 hours of delivery. We'll either replace your arrangement or provide a full refund, no questions asked."
id: "5", title: "What if I'm not satisfied with your order?", content: "Your satisfaction is our priority. If you're not happy with your flowers or arrangement, please contact us within 24 hours of delivery. We'll either replace your arrangement or provide a full refund, no questions asked."
},
{
id: "6", title: "Do you deliver outside the city?", content: "We offer delivery within a 20km radius of the city center. For deliveries outside this zone, please contact us directly to discuss options and possible additional delivery fees."
@@ -255,4 +255,4 @@ export default function LandingPage() {
</div>
</ThemeProvider>
);
}
}