Merge version_5 into main #8

Merged
bender merged 4 commits from version_5 into main 2026-02-23 13:30:57 +00:00
4 changed files with 38 additions and 68 deletions

View File

@@ -1,51 +1,27 @@
import type { Metadata } from "next";
import { Plus_Jakarta_Sans } from "next/font/google";
import { Inter } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import './globals.css';
import type { Metadata } from 'next';
import { Inter_Tight } from "next/font/google";
const plusJakartaSans = Plus_Jakarta_Sans({
variable: "--font-plus-jakarta-sans", subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
const interTight = Inter_Tight({
variable: "--font-inter-tight", subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"]
});
export const metadata: Metadata = {
title: "Balka Flowers Studio | Exquisite Floral Arrangements", description: "Discover stunning floral designs and custom arrangements from Balka Flowers, your local studio for fresh, handcrafted bouquets and event decor.", keywords: ["flowers", "floral studio", "bouquet", "arrangements", "custom flowers", "event decor", "florist", "Balka", "fresh flowers"],
openGraph: {
title: "Balka Flowers Studio | Exquisite Floral Arrangements", description: "Discover stunning floral designs and custom arrangements from Balka Flowers, your local studio for fresh, handcrafted bouquets and event decor.", url: "https://balkaflowers.com", siteName: "Balka Flowers", images: [
{
url: "https://img.b2bpic.net/free-photo/bouquet-pink-roses-with-green-leaves-inside-vase_114579-1439.jpg", alt: "Vibrant bouquet of fresh flowers"
}
],
type: "website"
},
twitter: {
card: "summary_large_image", title: "Balka Flowers Studio | Exquisite Floral Arrangements", description: "Discover stunning floral designs and custom arrangements from Balka Flowers, your local studio for fresh, handcrafted bouquets and event decor.", images: ["https://img.b2bpic.net/free-photo/bouquet-pink-roses-with-green-leaves-inside-vase_114579-1439.jpg"]
},
robots: {
index: true,
follow: true
}
};
title: 'Balka Flowers',
description: 'Exquisite floral arrangements for every occasion.',
}
export default function RootLayout({
children,
}: Readonly<{
children: React.ReactNode;
}>) {
}: {
children: React.ReactNode
}) {
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${plusJakartaSans.variable} ${inter.variable} antialiased`}
>
<Tag />
{children}
<html lang="en" className={`${interTight.variable}`}>
<body>
{children}
<script
dangerouslySetInnerHTML={{
__html: `
@@ -1413,7 +1389,6 @@ export default function RootLayout({
}}
/>
</body>
</ServiceWrapper>
</html>
);
)
}

View File

@@ -92,8 +92,7 @@ function ProductPageContent({ params }: ProductPageProps) {
<div id="navbar" data-section="navbar">
<NavbarLayoutFloatingInline
brandName="Balka Flowers"
navItems={[{ name: "Home", id: "/" }, { name: "Blog", id: "/blog" }, { name: "Shop", id: "/shop" }, { name: "Contact", id: "/contact" }]}
className="py-4 px-6 md:px-8"
navItems={[{ name: "Home", id: "/" }, { name: "Blog", id: "/blog" }, { name: "Shop", id: "/shop" }, { name: "Contact", id: "/contact" }]} className="py-4 px-6 md:px-8"
navItemClassName="text-foreground hover:text-primary-cta transition-colors"
buttonClassName="px-5 py-2"
buttonTextClassName="font-semibold"
@@ -126,8 +125,7 @@ function ProductPageContent({ params }: ProductPageProps) {
<div id="navbar" data-section="navbar">
<NavbarLayoutFloatingInline
brandName="Balka Flowers"
navItems={[{ name: "Home", id: "/" }, { name: "Blog", id: "/blog" }, { name: "Shop", id: "/shop" }, { name: "Contact", id: "/contact" }]}
className="py-4 px-6 md:px-8"
navItems={[{ name: "Home", id: "/" }, { name: "Blog", id: "/blog" }, { name: "Shop", id: "/shop" }, { name: "Contact", id: "/contact" }]} className="py-4 px-6 md:px-8"
navItemClassName="text-foreground hover:text-primary-cta transition-colors"
buttonClassName="px-5 py-2"
buttonTextClassName="font-semibold"
@@ -167,8 +165,7 @@ function ProductPageContent({ params }: ProductPageProps) {
<div id="navbar" data-section="navbar">
<NavbarLayoutFloatingInline
brandName="Balka Flowers"
navItems={[{ name: "Home", id: "/" }, { name: "Blog", id: "/blog" }, { name: "Shop", id: "/shop" }, { name: "Contact", id: "/contact" }]}
className="py-4 px-6 md:px-8"
navItems={[{ name: "Home", id: "/" }, { name: "Blog", id: "/blog" }, { name: "Shop", id: "/shop" }, { name: "Contact", id: "/contact" }]} className="py-4 px-6 md:px-8"
navItemClassName="text-foreground hover:text-primary-cta transition-colors"
buttonClassName="px-5 py-2"
buttonTextClassName="font-semibold"

View File

@@ -59,8 +59,7 @@ function ShopPageContent() {
<div id="navbar" data-section="navbar">
<NavbarLayoutFloatingInline
brandName="Balka Flowers"
navItems={[{ name: "Home", id: "/" }, { name: "Blog", id: "/blog" }, { name: "Shop", id: "/shop" }, { name: "Contact", id: "/contact" }]}
className="py-4 px-6 md:px-8"
navItems={[{ name: "Home", id: "/" }, { name: "Blog", id: "/blog" }, { name: "Shop", id: "/shop" }, { name: "Contact", id: "/contact" }]} className="py-4 px-6 md:px-8"
navItemClassName="text-foreground hover:text-primary-cta transition-colors"
buttonClassName="px-5 py-2"
buttonTextClassName="font-semibold"
@@ -92,8 +91,7 @@ function ShopPageContent() {
<div id="navbar" data-section="navbar">
<NavbarLayoutFloatingInline
brandName="Balka Flowers"
navItems={[{ name: "Home", id: "/" }, { name: "Blog", id: "/blog" }, { name: "Shop", id: "/shop" }, { name: "Contact", id: "/contact" }]}
className="py-4 px-6 md:px-8"
navItems={[{ name: "Home", id: "/" }, { name: "Blog", id: "/blog" }, { name: "Shop", id: "/shop" }, { name: "Contact", id: "/contact" }]} className="py-4 px-6 md:px-8"
navItemClassName="text-foreground hover:text-primary-cta transition-colors"
buttonClassName="px-5 py-2"
buttonTextClassName="font-semibold"

View File

@@ -2,23 +2,23 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #fdfdff;;
--card: #ffffff;;
--foreground: #2a0f3d;;
--primary-cta: #e63946;;
--secondary-cta: #d1c4e9;;
--accent: #8b5cf6;;
--background-accent: #f8f0ff;; */
/* --background: #060000;;
--card: #1d0d0d;;
--foreground: #ffe6e6;;
--primary-cta: #ff3d4a;;
--secondary-cta: #1f0a0a;;
--accent: #7b2d2d;;
--background-accent: #b8111f;; */
--background: #fdfdff;;
--card: #ffffff;;
--foreground: #2a0f3d;;
--primary-cta: #e63946;;
--primary-cta-text: #f5f5f5;;
--secondary-cta: #d1c4e9;;
--secondary-cta-text: #1c1c1c;;
--accent: #8b5cf6;;
--background-accent: #f8f0ff;;
--background: #060000;;
--card: #1d0d0d;;
--foreground: #ffe6e6;;
--primary-cta: #ff3d4a;;
--primary-cta-text: #060000;;
--secondary-cta: #1f0a0a;;
--secondary-cta-text: #ffe6e6;;
--accent: #7b2d2d;;
--background-accent: #b8111f;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);