development/04e93b3d-d169-42b5-bb43-259600607b9c
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #2

Open
development wants to merge 2 commits from version_1 into main
pull from: version_1
merge into: development:main
Conversation 0 Commits 2 Files Changed 2 +18 -16
2 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/page.tsx
View File

@@ -33,8 +33,10 @@ export default function Page() {
{ name: "Products", id: "products" },
{ name: "About", id: "about" },
{ name: "Testimonials", id: "testimonials" },
{ name: "Contact", id: "contact" }
]}
{ name: "Contact", id: "contact" },
{ name: "Blog", id: "/blog" },
]}
button={{
text: "Order Now", href: "contact"
}}

28
src/app/styles/variables.css
View File

@@ -2,21 +2,21 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #f5f4ef;
--card: #dad6cd;
--foreground: #2a2928;
--primary-cta: #2a2928;
--secondary-cta: #ecebea;
--accent: #ffffff;
--background-accent: #ffffff; */
/* --background: #0a0a0a;;
--card: #1a1a1a;;
--foreground: #fff5f5;;
--primary-cta: #ff7a7a;;
--secondary-cta: #1a1a1a;;
--accent: #737373;;
--background-accent: #737373;; */
--background: #fcf6ec;
--card: #f3ede2;
--foreground: #2e2521;
--primary-cta: #2e2521;
--secondary-cta: #ffffff;
--accent: #b2a28b;
--background-accent: #b2a28b;
--background: #0a0a0a;;
--card: #1a1a1a;;
--foreground: #fff5f5;;
--primary-cta: #ff7a7a;;
--secondary-cta: #1a1a1a;;
--accent: #737373;;
--background-accent: #737373;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);