diff --git a/app/error.tsx b/app/error.tsx index 1d8550784..91449b380 100644 --- a/app/error.tsx +++ b/app/error.tsx @@ -2,7 +2,7 @@ export default function Error({ reset }: { reset: () => void }) { return ( -
+

Oh no!

There was an issue with our storefront. This could be a temporary issue, please try your diff --git a/app/globals.css b/app/globals.css index 2ade56ef2..44b05caa2 100644 --- a/app/globals.css +++ b/app/globals.css @@ -17,7 +17,7 @@ a, input, button { - @apply focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-neutral-400 focus-visible:ring-offset-2 focus-visible:ring-offset-neutral-50 dark:focus-visible:ring-neutral-600 dark:focus-visible:ring-offset-neutral-900; + @apply focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-neutral-400 focus-visible:ring-offset-2 focus-visible:ring-offset-neutral-50; } .cls-1 { diff --git a/app/layout.tsx b/app/layout.tsx index b522228a0..9fa580293 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -41,7 +41,7 @@ const jubilee = localFont({ 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 47707f365..4e62a442d 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/layout.tsx b/app/search/layout.tsx index 24d1480d3..7ac069e7b 100644 --- a/app/search/layout.tsx +++ b/app/search/layout.tsx @@ -7,7 +7,7 @@ import { Suspense } from 'react'; export default function SearchLayout({ children }: { children: React.ReactNode }) { return ( -
+
diff --git a/app/search/loading.tsx b/app/search/loading.tsx index 855c371bc..9641d31bf 100644 --- a/app/search/loading.tsx +++ b/app/search/loading.tsx @@ -6,9 +6,7 @@ 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 515b94843..f7961dbba 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 814e1f389..42632cb80 100644 --- a/components/cart/delete-item-button.tsx +++ b/components/cart/delete-item-button.tsx @@ -28,7 +28,7 @@ function SubmitButton() { {pending ? ( ) : ( - + )} ); diff --git a/components/cart/edit-item-quantity-button.tsx b/components/cart/edit-item-quantity-button.tsx index b743ab704..959fe89dc 100644 --- a/components/cart/edit-item-quantity-button.tsx +++ b/components/cart/edit-item-quantity-button.tsx @@ -27,11 +27,11 @@ function SubmitButton({ type }: { type: 'plus' | 'minus' }) { )} > {pending ? ( - + ) : type === 'plus' ? ( - + ) : ( - + )} ); diff --git a/components/cart/modal.tsx b/components/cart/modal.tsx index ecffa4d7d..bdf95cf6e 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

@@ -96,10 +96,7 @@ export default function CartModal({ cart }: { cart: Cart | undefined }) { ); return ( -
  • +
  • @@ -109,7 +106,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}

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

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

    -
    +
    +

    Taxes

    -
    +

    Shipping

    Calculated at checkout

    -
    +

    Total

    diff --git a/components/cart/open-cart.tsx b/components/cart/open-cart.tsx index 79593be23..73a9eaecd 100644 --- a/components/cart/open-cart.tsx +++ b/components/cart/open-cart.tsx @@ -9,7 +9,7 @@ export default function OpenCart({ quantity?: number; }) { return ( -
    +
    diff --git a/components/grid/tile.tsx b/components/grid/tile.tsx index 71e89245f..8fe4509e2 100644 --- a/components/grid/tile.tsx +++ b/components/grid/tile.tsx @@ -24,7 +24,7 @@ export function GridTileImage({ return (
    ) { aria-label={`${process.env.SITE_NAME} logo`} viewBox="0 0 32 28" {...props} - className={clsx('h-4 w-4 fill-black dark:fill-white', props.className)} + className={clsx('h-4 w-4 fill-black', props.className)} > diff --git a/components/label.tsx b/components/label.tsx index edfb3c616..2cd4a1551 100644 --- a/components/label.tsx +++ b/components/label.tsx @@ -18,7 +18,7 @@ const Label = ({ 'lg:px-20 lg:pb-[35%]': position === 'center' })} > -
    +

    {title}

    diff --git a/components/layout/footer-menu.tsx b/components/layout/footer-menu.tsx index 4f6387edd..3a1ddb1ca 100644 --- a/components/layout/footer-menu.tsx +++ b/components/layout/footer-menu.tsx @@ -19,9 +19,9 @@ const FooterMenuItem = ({ item }: { item: Menu }) => { diff --git a/components/layout/footer.tsx b/components/layout/footer.tsx index 6c60e6959..bd0857737 100644 --- a/components/layout/footer.tsx +++ b/components/layout/footer.tsx @@ -10,15 +10,15 @@ const { COMPANY_NAME, SITE_NAME } = process.env; export default async function Footer() { const currentYear = new Date().getFullYear(); const copyrightDate = 2023 + (currentYear > 2023 ? `-${currentYear}` : ''); - const skeleton = 'w-full h-6 animate-pulse rounded bg-neutral-200 dark:bg-neutral-700'; + const skeleton = 'w-full h-6 animate-pulse rounded bg-neutral-200'; const menu = await getMenu('next-js-frontend-footer-menu'); const copyrightName = COMPANY_NAME || SITE_NAME || ''; return ( -