Merge version_2 into main

Merge version_2 into main
This commit was merged in pull request #5.
This commit is contained in:
2026-02-22 12:19:02 +00:00
8 changed files with 25 additions and 18 deletions

View File

@@ -11,6 +11,7 @@ export default function AboutPage() {
{ name: "Home", id: "/" },
{ name: "Products", id: "/products" },
{ name: "About", id: "/about" },
{ name: "Blog", id: "/blog" },
{ name: "Contact", id: "/contact" }
];

View File

@@ -10,6 +10,7 @@ export default function BlogPage() {
{ name: "Home", id: "/" },
{ name: "Products", id: "/products" },
{ name: "About", id: "/about" },
{ name: "Blog", id: "/blog" },
{ name: "Contact", id: "/contact" }
];

View File

@@ -11,6 +11,7 @@ export default function ContactPage() {
{ name: "Home", id: "/" },
{ name: "Products", id: "/products" },
{ name: "About", id: "/about" },
{ name: "Blog", id: "/blog" },
{ name: "Contact", id: "/contact" }
];

View File

@@ -15,6 +15,7 @@ export default function HomePage() {
{ name: "Home", id: "/" },
{ name: "Products", id: "/products" },
{ name: "About", id: "/about" },
{ name: "Blog", id: "/blog" },
{ name: "Contact", id: "/contact" }
];

View File

@@ -10,6 +10,7 @@ export default function ProductsPage() {
{ name: "Home", id: "/" },
{ name: "Products", id: "/products" },
{ name: "About", id: "/about" },
{ name: "Blog", id: "/blog" },
{ name: "Contact", id: "/contact" }
];

View File

@@ -9,6 +9,7 @@ export default function ProductPage({ params }: { params: { id: string } }) {
{ name: "Home", id: "/" },
{ name: "Products", id: "/products" },
{ name: "About", id: "/about" },
{ name: "Blog", id: "/blog" },
{ name: "Contact", id: "/contact" }
];
@@ -73,4 +74,4 @@ export default function ProductPage({ params }: { params: { id: string } }) {
</div>
</ThemeProvider>
);
}
}

View File

@@ -10,6 +10,7 @@ export default function ShopPage() {
{ name: "Home", id: "/" },
{ name: "Products", id: "/products" },
{ name: "About", id: "/about" },
{ name: "Blog", id: "/blog" },
{ name: "Contact", id: "/contact" }
];
@@ -85,4 +86,4 @@ export default function ShopPage() {
</div>
</ThemeProvider>
);
}
}

View File

@@ -2,23 +2,23 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #f7f6f7;;
--card: #ffffff;;
--foreground: #032419;;
--primary-cta: #2bb889;;
--secondary-cta: #ffffff;;
--accent: #09b97e;;
--background-accent: #a8e8c3;; */
/* --background: #0a0a0a;;
--card: #1a1a1a;;
--foreground: #ffffffe6;;
--primary-cta: #e6e6e6;;
--secondary-cta: #1a1a1a;;
--accent: #737373;;
--background-accent: #737373;; */
--background: #f7f6f7;;
--card: #ffffff;;
--foreground: #032419;;
--primary-cta: #2bb889;;
--primary-cta-text: #f7f6f7;;
--secondary-cta: #ffffff;;
--secondary-cta-text: #032419;;
--accent: #09b97e;;
--background-accent: #a8e8c3;;
--background: #0a0a0a;;
--card: #1a1a1a;;
--foreground: #ffffffe6;;
--primary-cta: #e6e6e6;;
--primary-cta-text: #0a0a0a;;
--secondary-cta: #1a1a1a;;
--secondary-cta-text: #ffffffe6;;
--accent: #737373;;
--background-accent: #737373;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);