diff --git a/app/globals.css b/app/globals.css index a941157bd..c9d67b8c2 100644 --- a/app/globals.css +++ b/app/globals.css @@ -11,5 +11,5 @@ a, input, button { - @apply focus:outline-none focus:ring-2 focus:ring-gray-400 focus:ring-offset-2 focus:ring-offset-gray-50 dark:focus:ring-gray-600 dark:focus:ring-offset-dark; + @apply focus:outline-none focus:ring-2 focus:ring-neutral-400 focus:ring-offset-2 focus:ring-offset-neutral-50 dark:focus:ring-neutral-600 dark:focus:ring-offset-neutral-900; } diff --git a/app/layout.tsx b/app/layout.tsx index 51bbcd313..2674f79fc 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -33,7 +33,7 @@ const inter = Inter({ export default async function RootLayout({ children }: { children: ReactNode }) { return ( - +
{children}
diff --git a/app/product/[handle]/page.tsx b/app/product/[handle]/page.tsx index d9c7b9e40..9c1fc6664 100644 --- a/app/product/[handle]/page.tsx +++ b/app/product/[handle]/page.tsx @@ -82,7 +82,7 @@ export default async function ProductPage({ params }: { params: { handle: string }} />
-
+
({ diff --git a/app/search/loading.tsx b/app/search/loading.tsx index 3b4bd399f..855c371bc 100644 --- a/app/search/loading.tsx +++ b/app/search/loading.tsx @@ -6,7 +6,9 @@ export default function Loading() { {Array(12) .fill(0) .map((_, index) => { - return ; + return ( + + ); })} ); diff --git a/components/cart/close-cart.tsx b/components/cart/close-cart.tsx index b653ee044..515b94843 100644 --- a/components/cart/close-cart.tsx +++ b/components/cart/close-cart.tsx @@ -3,7 +3,7 @@ import clsx from 'clsx'; export default function CloseCart({ className }: { className?: string }) { return ( -
+
); diff --git a/components/cart/delete-item-button.tsx b/components/cart/delete-item-button.tsx index 5c0419358..f279f178d 100644 --- a/components/cart/delete-item-button.tsx +++ b/components/cart/delete-item-button.tsx @@ -28,7 +28,7 @@ export default function DeleteItemButton({ item }: { item: CartItem }) { }} disabled={isPending} className={clsx( - 'ease flex h-[17px] w-[17px] items-center justify-center rounded-full bg-gray-500 transition-all duration-200', + 'ease flex h-[17px] w-[17px] items-center justify-center rounded-full bg-neutral-500 transition-all duration-200', { 'cursor-not-allowed px-0': isPending } diff --git a/components/cart/edit-item-quantity-button.tsx b/components/cart/edit-item-quantity-button.tsx index a9c07b73b..8b1553f73 100644 --- a/components/cart/edit-item-quantity-button.tsx +++ b/components/cart/edit-item-quantity-button.tsx @@ -41,7 +41,7 @@ export default function EditItemQuantityButton({ }} disabled={isPending} className={clsx( - 'ease flex h-full min-w-[36px] max-w-[36px] flex-none items-center justify-center rounded-full px-2 transition-all duration-200 hover:border-gray-800 hover:opacity-80', + 'ease flex h-full min-w-[36px] max-w-[36px] flex-none items-center justify-center rounded-full px-2 transition-all duration-200 hover:border-neutral-800 hover:opacity-80', { 'cursor-not-allowed': isPending, 'ml-auto': type === 'minus' @@ -51,9 +51,9 @@ export default function EditItemQuantityButton({ {isPending ? ( ) : type === 'plus' ? ( - + ) : ( - + )} ); diff --git a/components/cart/modal.tsx b/components/cart/modal.tsx index c2ed2d1ae..2abf49b8e 100644 --- a/components/cart/modal.tsx +++ b/components/cart/modal.tsx @@ -64,7 +64,7 @@ export default function CartModal({ cart }: { cart: Cart | undefined }) { leaveFrom="translate-x-0" leaveTo="translate-x-full" > - +

My Cart

@@ -99,7 +99,7 @@ export default function CartModal({ cart }: { cart: Cart | undefined }) {
  • @@ -110,7 +110,7 @@ export default function CartModal({ cart }: { cart: Cart | undefined }) { onClick={closeCart} className="z-30 flex flex-row space-x-4" > -
    +
    {item.merchandise.title !== DEFAULT_OPTION ? (

    {item.merchandise.title} @@ -143,7 +143,7 @@ export default function CartModal({ cart }: { cart: Cart | undefined }) { amount={item.cost.totalAmount.amount} currencyCode={item.cost.totalAmount.currencyCode} /> -

    +

    {item.quantity} @@ -156,8 +156,8 @@ export default function CartModal({ cart }: { cart: Cart | undefined }) { ); })} -

    -
    +
    +

    Taxes

    -
    +

    Shipping

    Calculated at checkout

    -
    +

    Total

    +
    diff --git a/components/grid/tile.tsx b/components/grid/tile.tsx index 87ec8f3f1..5ee714a2b 100644 --- a/components/grid/tile.tsx +++ b/components/grid/tile.tsx @@ -26,7 +26,7 @@ export function GridTileImage({ { relative: labels, 'border-2 border-blue-600': active, - 'border-gray-200 dark:border-gray-800': !active + 'border-neutral-200 dark:border-neutral-800': !active } )} > diff --git a/components/label.tsx b/components/label.tsx index 74c14d0f6..8aa7a6fca 100644 --- a/components/label.tsx +++ b/components/label.tsx @@ -23,7 +23,7 @@ const Label = ({ >
    2023 ? `-${currentYear}` : ''); - const skeleton = 'w-full h-6 animate-pulse rounded bg-gray-200 dark:bg-gray-700'; + const skeleton = 'w-full h-6 animate-pulse rounded bg-neutral-200 dark:bg-neutral-700'; const menu = await getMenu('next-js-frontend-footer-menu'); return ( -