From 6a506d737d96ba97970b94e24308c1bfe7569a91 Mon Sep 17 00:00:00 2001
From: StephDietz <steph.dietz@vercel.com>
Date: Wed, 12 Jul 2023 10:41:18 -0500
Subject: [PATCH] rebase continue

---
 app/layout.tsx          | 2 +-
 components/carousel.tsx | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/layout.tsx b/app/layout.tsx
index 74bbc1866..95e62e5bc 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 (
     <html lang="en" className={inter.variable}>
-      <body className="bg-gray-50 text-black selection:bg-teal-300 dark:bg-dark dark:text-white dark:selection:bg-fuchsia-600 dark:selection:text-white">
+      <body className="text-black bg-gray-50 selection:bg-teal-300 dark:bg-dark dark:text-white dark:selection:bg-fuchsia-600 dark:selection:text-white">
         <Navbar />
         <Suspense>
           <main>{children}</main>
diff --git a/components/carousel.tsx b/components/carousel.tsx
index 2a8d2526f..72bb4d47d 100644
--- a/components/carousel.tsx
+++ b/components/carousel.tsx
@@ -10,8 +10,8 @@ export async function Carousel() {
   if (!products?.length) return null;
 
   return (
-    <div className="relative w-full overflow-hidden pb-6">
-      <div className="flex animate-carousel space-x-4">
+    <div className="relative w-full pb-6 overflow-hidden">
+      <div className="flex space-x-4 animate-carousel">
         {[...products, ...products].map((product, i) => (
           <Link
             key={`${product.handle}${i}`}
@@ -21,7 +21,7 @@ export async function Carousel() {
             {product.featuredImage ? (
               <Image
                 alt={product.title}
-                className="h-full object-contain"
+                className="object-contain h-full"
                 fill
                 sizes="33vw"
                 src={product.featuredImage.url}
