Merge branch 'Weaverse:main' into main

Weaverse · Dec 10, 2024 · d79e5e1 · d79e5e1
2 parents d308f38 + 7e1f9dc
commit d79e5e1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/app/components/header/desktop-header.tsx b/app/components/header/desktop-header.tsx
@@ -16,6 +16,7 @@ import { useIsHomePath } from "~/lib/utils";
 import type { RootLoader } from "~/root";
 import { DesktopMenu } from "./menu/desktop-menu";
 import { PredictiveSearchButton } from "./predictive-search";
+import { CartCount } from "./cart-count";
 
 let variants = cva("", {
   variants: {
@@ -46,7 +47,7 @@ export function DesktopHeader() {
     <header
       className={cn(
         "transition-all duration-300 ease-in-out",
-        "hidden lg:block lg:w-full z-1",
+        "hidden lg:block lg:w-full z-10",
         "bg-[--color-header-bg] hover:bg-[--color-header-bg]",
         "text-[--color-header-text] hover:text-[--color-header-text]",
         "border-b border-[rgb(230,230,230)]",
@@ -72,12 +73,12 @@ export function DesktopHeader() {
         <div className="flex items-center gap-1 z-1">
           <PredictiveSearchButton />
           <AccountLink className="relative flex items-center justify-center w-8 h-8" />
-          <DialogDemo openFrom="right" />
-          {/* <CartCount
+          {/* <DialogDemo openFrom="right" /> */}
+          <CartCount
             isHome={isHome}
-            openCart={openCart}
+            openCart={() => {}}
             isTransparent={isTransparent}
-          /> */}
+          />
         </div>
       </div>
     </header>

diff --git a/app/components/header/mobile-header.tsx b/app/components/header/mobile-header.tsx
@@ -32,7 +32,7 @@ export function MobileHeader({
     <header
       className={cn(
         "transition-colors duration-300 ease-in-out",
-        "h-nav z-1 top-[var(--topbar-height,var(--initial-topbar-height))] w-full leading-none",
+        "h-nav z-10 top-[var(--topbar-height,var(--initial-topbar-height))] w-full leading-none",
         "flex lg:hidden justify-between items-center gap-4",
         "px-3 md:px-10",
         "text-[--color-header-text] bg-[--color-header-bg]",