Merge version_1 into main #2

Merged
bender merged 2 commits from version_1 into main 2026-03-10 19:57:14 +00:00
2 changed files with 21 additions and 42 deletions

View File

@@ -20,7 +20,7 @@ export default function LandingPage() {
borderRadius="pill"
contentWidth="mediumLarge"
sizing="largeSmall"
background="noise"
background="circleGradient"
cardStyle="glass-elevated"
primaryButtonStyle="flat"
secondaryButtonStyle="radial-glow"
@@ -54,7 +54,7 @@ export default function LandingPage() {
imageSrc: "http://img.b2bpic.net/free-photo/stylish-man-riding-cycle-near-ferris-wheel-park_23-2148176599.jpg", imageAlt: "Precision scale model fighter jet"
},
{
imageSrc: "http://img.b2bpic.net/free-photo/soldier-camouflage-uniform-wearing-protective-gloves-mask-showing-stop-sign-with-his-hand-against-black-background_342744-923.jpg?_wi=1", imageAlt: "Premium military aircraft collection"
imageSrc: "http://img.b2bpic.net/free-photo/soldier-camouflage-uniform-wearing-protective-gloves-mask-showing-stop-sign-with-his-hand-against-black-background_342744-923.jpg", imageAlt: "Premium military aircraft collection"
},
{
imageSrc: "http://img.b2bpic.net/free-photo/armenian-army-units-trainings_181624-29357.jpg", imageAlt: "Detailed fighter jet miniature display"
@@ -159,7 +159,7 @@ export default function LandingPage() {
id: "4", value: "1:241:200", description: "Scale range options providing collectors with diverse display and collection possibilities"
}
]}
metricsAnimation="scale-rotate"
metricsAnimation="blur-reveal"
useInvertedBackground={false}
ariaLabel="Metrics section"
/>
@@ -220,7 +220,7 @@ export default function LandingPage() {
textboxLayout="default"
useInvertedBackground={false}
mediaPosition="left"
imageSrc="http://img.b2bpic.net/free-photo/soldier-camouflage-uniform-wearing-protective-gloves-mask-showing-stop-sign-with-his-hand-against-black-background_342744-923.jpg?_wi=2"
imageSrc="http://img.b2bpic.net/free-photo/soldier-camouflage-uniform-wearing-protective-gloves-mask-showing-stop-sign-with-his-hand-against-black-background_342744-923.jpg"
imageAlt="Premium scale model fighter jets"
/>
</div>
@@ -233,7 +233,7 @@ export default function LandingPage() {
{ text: "Contact Us", href: "mailto:hello@machx.aero" },
{ text: "Request Catalog", href: "#" }
]}
background={{ variant: "noise" }}
background={{ variant: "plain" }}
useInvertedBackground={true}
ariaLabel="Contact section"
/>

View File

@@ -1,51 +1,30 @@
"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;
textClassName?: 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 = '', textClassName = '' }) => {
return (
<svg
ref={svgRef}
viewBox={viewBox}
className={cls("w-full", className)}
style={{ aspectRatio: aspectRatio }}
preserveAspectRatio="none"
role="img"
aria-label={`${logoText} logo`}
className={`inline-block ${className}`}
viewBox={`0 0 ${text.length * 60} 100`}
xmlns="http://www.w3.org/2000/svg"
preserveAspectRatio="xMidYMid meet"
>
<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"
}}
x="50%"
y="50%"
textAnchor="middle"
dominantBaseline="middle"
className={`text-2xl font-bold fill-current ${textClassName}`}
>
{logoText}
{text}
</text>
</svg>
);
});
};
SvgTextLogo.displayName = "SvgTextLogo";
export default SvgTextLogo;
export default SvgTextLogo;