bender/b4a563f7-6ec1-4307-b08d-a0dd5ff037cc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #6

Merged
bender merged 4 commits from version_2 into main 2026-03-03 19:27:44 +00:00
Conversation 0 Commits 4 Files Changed 4 +12 -24
4 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/about/page.tsx
View File

@@ -63,7 +63,7 @@ export default function AboutPage() {
<NavbarLayoutFloatingInline
navItems={navItems}
brandName="UNREST"
button={{ text: "Cart", href: "/cart" }}
button={{ text: "Cart", href: "/cart", pressable: true }}
animateOnLoad={true}
/>
</div>
@@ -96,11 +96,8 @@ export default function AboutPage() {
</div>
<div id="footer" data-section="footer">
<FooterLogoEmphasis
columns={footerColumns}
logoText="UNREST"
/>
<FooterLogoEmphasis columns={footerColumns} logoText="UNREST" />
</div>
</ThemeProvider>
);
}
}

9
src/app/contact/page.tsx
View File

@@ -63,7 +63,7 @@ export default function ContactPage() {
<NavbarLayoutFloatingInline
navItems={navItems}
brandName="UNREST"
button={{ text: "Cart", href: "/cart" }}
button={{ text: "Cart", href: "/cart", pressable: true }}
animateOnLoad={true}
/>
</div>
@@ -110,11 +110,8 @@ export default function ContactPage() {
</div>
<div id="footer" data-section="footer">
<FooterLogoEmphasis
columns={footerColumns}
logoText="UNREST"
/>
<FooterLogoEmphasis columns={footerColumns} logoText="UNREST" />
</div>
</ThemeProvider>
);
}
}

9
src/app/page.tsx
View File

@@ -67,7 +67,7 @@ export default function HomePage() {
<NavbarLayoutFloatingInline
navItems={navItems}
brandName="UNREST"
button={{ text: "Cart", href: "/cart" }}
button={{ text: "Cart", href: "/cart", pressable: true }}
animateOnLoad={true}
/>
</div>
@@ -168,11 +168,8 @@ export default function HomePage() {
</div>
<div id="footer" data-section="footer">
<FooterLogoEmphasis
columns={footerColumns}
logoText="UNREST"
/>
<FooterLogoEmphasis columns={footerColumns} logoText="UNREST" />
</div>
</ThemeProvider>
);
}
}

9
src/app/shop/page.tsx
View File

@@ -63,7 +63,7 @@ export default function ShopPage() {
<NavbarLayoutFloatingInline
navItems={navItems}
brandName="UNREST"
button={{ text: "Cart", href: "/cart" }}
button={{ text: "Cart", href: "/cart", pressable: true }}
animateOnLoad={true}
/>
</div>
@@ -119,11 +119,8 @@ export default function ShopPage() {
</div>
<div id="footer" data-section="footer">
<FooterLogoEmphasis
columns={footerColumns}
logoText="UNREST"
/>
<FooterLogoEmphasis columns={footerColumns} logoText="UNREST" />
</div>
</ThemeProvider>
);
}
}