Merge version_2 into main #1

Merged
bender merged 5 commits from version_2 into main 2026-02-23 12:41:19 +00:00
5 changed files with 34 additions and 13 deletions

View File

@@ -22,6 +22,9 @@ export default function BlogPage() {
primaryButtonStyle="diagonal-gradient"
secondaryButtonStyle="layered"
headingFontWeight="normal"
theme={{
"--background": "#fdfdff", "--card": "#ffffff", "--foreground": "#2a0f3d", "--primary-cta": "#e63946", "--secondary-cta": "#d1c4e9", "--accent": "#8b5cf6", "--background-accent": "#f8f0ff"
}}
>
<ReactLenis root>
<div id="nav" data-section="nav">

View File

@@ -23,6 +23,9 @@ export default function LandingPage() {
primaryButtonStyle="diagonal-gradient"
secondaryButtonStyle="layered"
headingFontWeight="normal"
theme={{
"--background": "#fdfdff", "--card": "#ffffff", "--foreground": "#2a0f3d", "--primary-cta": "#e63946", "--secondary-cta": "#d1c4e9", "--accent": "#8b5cf6", "--background-accent": "#f8f0ff"
}}
>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
@@ -78,7 +81,7 @@ export default function LandingPage() {
<TextSplitAbout
title="Our Passion for Flowers"
description={[
"At Balka, we believe in the power of flowers to transform spaces and convey emotions. Our studio is dedicated to sourcing the freshest blooms and creating bespoke arrangements that tell your unique story. From elegant bouquets to grand event decor, every creation is a testament to our artistry and attention to detail.", "We are a team of passionate florists committed to sustainable practices and unparalleled customer service. With years of experience, we've cultivated a reputation for excellence, ensuring every order from Balka Flowers brings joy and beauty to your life."]}
"At Balka, we believe in the power of flowers to transform spaces and convey emotions. Our studio is dedicated to sourcing the freshest blooms and creating bespoke arrangements that tell your unique story. From elegant bouquets to grand event decor, every creation is a testament to our artistry and attention to detail.", "We are a team of passionate florists committed to sustainable practices and unparalleled customer service. With years of experience, we've cultivated a reputation for excellence, ensuring every order from Balka Flowers brings joy and beauty to your life." ]}
useInvertedBackground={false}
showBorder={true}
buttons={[{ text: "Learn More About Us", href: "#contact" }]}

View File

@@ -87,6 +87,9 @@ function ProductPageContent({ params }: ProductPageProps) {
primaryButtonStyle="diagonal-gradient"
secondaryButtonStyle="layered"
headingFontWeight="normal"
theme={{
"--background": "#fdfdff", "--card": "#ffffff", "--foreground": "#2a0f3d", "--primary-cta": "#e63946", "--secondary-cta": "#d1c4e9", "--accent": "#8b5cf6", "--background-accent": "#f8f0ff"
}}
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
@@ -121,6 +124,9 @@ function ProductPageContent({ params }: ProductPageProps) {
primaryButtonStyle="diagonal-gradient"
secondaryButtonStyle="layered"
headingFontWeight="normal"
theme={{
"--background": "#fdfdff", "--card": "#ffffff", "--foreground": "#2a0f3d", "--primary-cta": "#e63946", "--secondary-cta": "#d1c4e9", "--accent": "#8b5cf6", "--background-accent": "#f8f0ff"
}}
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
@@ -162,6 +168,9 @@ function ProductPageContent({ params }: ProductPageProps) {
primaryButtonStyle="diagonal-gradient"
secondaryButtonStyle="layered"
headingFontWeight="normal"
theme={{
"--background": "#fdfdff", "--card": "#ffffff", "--foreground": "#2a0f3d", "--primary-cta": "#e63946", "--secondary-cta": "#d1c4e9", "--accent": "#8b5cf6", "--background-accent": "#f8f0ff"
}}
>
<ReactLenis root>
<div id="navbar" data-section="navbar">

View File

@@ -54,6 +54,9 @@ function ShopPageContent() {
primaryButtonStyle="diagonal-gradient"
secondaryButtonStyle="layered"
headingFontWeight="normal"
theme={{
"--background": "#fdfdff", "--card": "#ffffff", "--foreground": "#2a0f3d", "--primary-cta": "#e63946", "--secondary-cta": "#d1c4e9", "--accent": "#8b5cf6", "--background-accent": "#f8f0ff"
}}
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
@@ -87,6 +90,9 @@ function ShopPageContent() {
primaryButtonStyle="diagonal-gradient"
secondaryButtonStyle="layered"
headingFontWeight="normal"
theme={{
"--background": "#fdfdff", "--card": "#ffffff", "--foreground": "#2a0f3d", "--primary-cta": "#e63946", "--secondary-cta": "#d1c4e9", "--accent": "#8b5cf6", "--background-accent": "#f8f0ff"
}}
>
<ReactLenis root>
<div id="navbar" data-section="navbar">

View File

@@ -2,23 +2,23 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #f5f5f5;;
/* --background: #fdfdff;;
--card: #ffffff;;
--foreground: #1c1c1c;;
--primary-cta: #341f51;;
--secondary-cta: #ffffff;;
--accent: #6139e6;;
--background-accent: #b3a8e8;; */
--foreground: #2a0f3d;;
--primary-cta: #e63946;;
--secondary-cta: #d1c4e9;;
--accent: #8b5cf6;;
--background-accent: #f8f0ff;; */
--background: #f5f5f5;;
--background: #fdfdff;;
--card: #ffffff;;
--foreground: #1c1c1c;;
--primary-cta: #341f51;;
--foreground: #2a0f3d;;
--primary-cta: #e63946;;
--primary-cta-text: #f5f5f5;;
--secondary-cta: #ffffff;;
--secondary-cta: #d1c4e9;;
--secondary-cta-text: #1c1c1c;;
--accent: #6139e6;;
--background-accent: #b3a8e8;;
--accent: #8b5cf6;;
--background-accent: #f8f0ff;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);