7 Commits

Author SHA1 Message Date
ab0f260417 Merge version_2 into main
Merge version_2 into main
2026-02-18 07:53:59 +00:00
189b428e66 Update src/app/styles/variables.css 2026-02-18 07:53:55 +00:00
9405f1a97d Update src/app/shop/page.tsx 2026-02-18 07:53:54 +00:00
82b17dbd7e Update src/app/shop/[id]/page.tsx 2026-02-18 07:53:54 +00:00
10da0a1578 Update src/app/page.tsx 2026-02-18 07:53:53 +00:00
db065538cf Update src/app/layout.tsx 2026-02-18 07:53:52 +00:00
1a93ede947 Update src/app/blog/page.tsx 2026-02-18 07:53:51 +00:00
6 changed files with 29 additions and 34 deletions

View File

@@ -18,7 +18,7 @@ export default function BlogPage() {
borderRadius="soft"
contentWidth="medium"
sizing="largeSmallSizeMediumTitles"
background="grid"
background="aurora"
cardStyle="gradient-mesh"
primaryButtonStyle="radial-glow"
secondaryButtonStyle="solid"
@@ -72,4 +72,4 @@ export default function BlogPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

View File

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

View File

@@ -21,7 +21,7 @@ export default function LandingPage() {
borderRadius="soft"
contentWidth="medium"
sizing="largeSmallSizeMediumTitles"
background="grid"
background="aurora"
cardStyle="gradient-mesh"
primaryButtonStyle="radial-glow"
secondaryButtonStyle="solid"
@@ -280,4 +280,4 @@ export default function LandingPage() {
</div>
</ThemeProvider>
);
}
}

View File

@@ -75,7 +75,7 @@ export default function ProductPage({ params }: ProductPageProps) {
borderRadius="soft"
contentWidth="medium"
sizing="largeSmallSizeMediumTitles"
background="grid"
background="aurora"
cardStyle="gradient-mesh"
primaryButtonStyle="radial-glow"
secondaryButtonStyle="solid"
@@ -90,8 +90,7 @@ export default function ProductPage({ params }: ProductPageProps) {
{"name":"Services","id":"services"},
{"name":"Portfolio","id":"portfolio"},
{"name":"About","id":"why-us"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
{"name":"Contact","id":"contact"}
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -123,7 +122,7 @@ export default function ProductPage({ params }: ProductPageProps) {
borderRadius="soft"
contentWidth="medium"
sizing="largeSmallSizeMediumTitles"
background="grid"
background="aurora"
cardStyle="gradient-mesh"
primaryButtonStyle="radial-glow"
secondaryButtonStyle="solid"
@@ -138,8 +137,7 @@ export default function ProductPage({ params }: ProductPageProps) {
{"name":"Services","id":"services"},
{"name":"Portfolio","id":"portfolio"},
{"name":"About","id":"why-us"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
{"name":"Contact","id":"contact"}
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -178,7 +176,7 @@ export default function ProductPage({ params }: ProductPageProps) {
borderRadius="soft"
contentWidth="medium"
sizing="largeSmallSizeMediumTitles"
background="grid"
background="aurora"
cardStyle="gradient-mesh"
primaryButtonStyle="radial-glow"
secondaryButtonStyle="solid"
@@ -193,8 +191,7 @@ export default function ProductPage({ params }: ProductPageProps) {
{"name":"Services","id":"services"},
{"name":"Portfolio","id":"portfolio"},
{"name":"About","id":"why-us"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
{"name":"Contact","id":"contact"}
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -249,4 +246,4 @@ export default function ProductPage({ params }: ProductPageProps) {
</ReactLenis>
</ThemeProvider>
);
}
}

View File

@@ -25,7 +25,7 @@ export default function ShopPage() {
borderRadius="soft"
contentWidth="medium"
sizing="largeSmallSizeMediumTitles"
background="grid"
background="aurora"
cardStyle="gradient-mesh"
primaryButtonStyle="radial-glow"
secondaryButtonStyle="solid"
@@ -40,8 +40,7 @@ export default function ShopPage() {
{"name":"Services","id":"services"},
{"name":"Portfolio","id":"portfolio"},
{"name":"About","id":"why-us"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
{"name":"Contact","id":"contact"}
]}
button={{ text: "Cart", onClick: () => console.log("cart") }}
/>
@@ -72,7 +71,7 @@ export default function ShopPage() {
borderRadius="soft"
contentWidth="medium"
sizing="largeSmallSizeMediumTitles"
background="grid"
background="aurora"
cardStyle="gradient-mesh"
primaryButtonStyle="radial-glow"
secondaryButtonStyle="solid"
@@ -87,8 +86,7 @@ export default function ShopPage() {
{"name":"Services","id":"services"},
{"name":"Portfolio","id":"portfolio"},
{"name":"About","id":"why-us"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
{"name":"Contact","id":"contact"}
]}
button={{ text: "Cart", onClick: () => console.log("cart") }}
/>
@@ -118,4 +116,4 @@ export default function ShopPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

View File

@@ -2,21 +2,21 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #0f0f0f;;
--card: #1a1a1a;;
--foreground: #ffd700;;
--primary-cta: #ffd700;;
/* --background: #f5faff;;
--card: #f1f8ff;;
--foreground: #001122;;
--primary-cta: #15479c;;
--secondary-cta: #ffffff;;
--accent: #2d2d2d;;
--background-accent: #333333;; */
--accent: #a8cce8;;
--background-accent: #7ba3cf;; */
--background: #0f0f0f;;
--card: #1a1a1a;;
--foreground: #ffd700;;
--primary-cta: #ffd700;;
--background: #f5faff;;
--card: #f1f8ff;;
--foreground: #001122;;
--primary-cta: #15479c;;
--secondary-cta: #ffffff;;
--accent: #2d2d2d;;
--background-accent: #333333;;
--accent: #a8cce8;;
--background-accent: #7ba3cf;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);