Merge version_1 into main #1

Merged
bender merged 2 commits from version_1 into main 2026-03-12 21:13:01 +00:00
2 changed files with 29 additions and 39 deletions

View File

@@ -15,12 +15,12 @@ import { CheckCircle, Shield, Star, Home, Heart, Wrench, Phone, ClipboardList }
export default function MagnoliaRoofingPage() {
return (
<ThemeProvider
defaultButtonVariant="bounce-effect"
defaultButtonVariant="text-stagger"
defaultTextAnimation="entrance-slide"
borderRadius="pill"
contentWidth="mediumSmall"
sizing="mediumSizeLargeTitles"
background="noise"
background="circleGradient"
cardStyle="solid"
primaryButtonStyle="shadow"
secondaryButtonStyle="layered"
@@ -51,7 +51,7 @@ export default function MagnoliaRoofingPage() {
{ text: "Call (530) 848-0642", onClick: () => window.location.href = "tel:5308480642" }
]}
buttonAnimation="slide-up"
background={{ variant: "noise" }}
background={{ variant: "plain" }}
carouselItems={[
{ id: "1", imageSrc: "http://img.b2bpic.net/free-photo/fence-s-silhouette-with-sky-background_1160-223.jpg", imageAlt: "Professional roof installation" },
{ id: "2", imageSrc: "http://img.b2bpic.net/free-photo/two-muslim-women-with-hijabs-consulting-map-while-traveling_23-2149275813.jpg", imageAlt: "Quality roofing work" },
@@ -204,7 +204,7 @@ export default function MagnoliaRoofingPage() {
{ text: "Call (530) 848-0642", onClick: () => window.location.href = "tel:5308480642" },
{ text: "Request Free Inspection", href: "#" }
]}
buttonAnimation="bounce-effect"
buttonAnimation="slide-up"
background={{ variant: "radial-gradient" }}
useInvertedBackground={false}
/>

View File

@@ -1,51 +1,41 @@
"use client";
import { memo } from "react";
import useSvgTextLogo from "./useSvgTextLogo";
import { cls } from "@/lib/utils";
import React from 'react';
interface SvgTextLogoProps {
logoText: string;
adjustHeightFactor?: number;
verticalAlign?: "top" | "center";
text: string;
className?: string;
textColor?: string;
fontSize?: number;
fontWeight?: number | string;
fontFamily?: string;
}
const SvgTextLogo = memo<SvgTextLogoProps>(function SvgTextLogo({
logoText,
adjustHeightFactor,
verticalAlign = "top",
className = "",
}) {
const { svgRef, textRef, viewBox, aspectRatio } = useSvgTextLogo(logoText, false, adjustHeightFactor);
const SvgTextLogo: React.FC<SvgTextLogoProps> = ({
text,
className = '',
textColor = 'currentColor',
fontSize = 24,
fontWeight = 700,
fontFamily = 'inherit',
}) => {
return (
<svg
ref={svgRef}
viewBox={viewBox}
className={cls("w-full", className)}
style={{ aspectRatio: aspectRatio }}
preserveAspectRatio="none"
role="img"
aria-label={`${logoText} logo`}
viewBox={`0 0 ${text.length * 20} 40`}
className={`inline-block ${className}`}
xmlns="http://www.w3.org/2000/svg"
>
<text
ref={textRef}
x="0"
y={verticalAlign === "center" ? "50%" : "0"}
className="font-bold fill-current"
style={{
fontSize: "20px",
letterSpacing: "-0.02em",
dominantBaseline: verticalAlign === "center" ? "middle" : "text-before-edge"
}}
y="28"
fontSize={fontSize}
fontWeight={fontWeight}
fontFamily={fontFamily}
fill={textColor}
dominantBaseline="auto"
>
{logoText}
{text}
</text>
</svg>
);
});
SvgTextLogo.displayName = "SvgTextLogo";
};
export default SvgTextLogo;