From 53da43fa05c33f5ee0e1615f6af08a65235ec7d5 Mon Sep 17 00:00:00 2001
From: chark1es <charles15851@gmail.com>
Date: Mon, 27 Jan 2025 10:40:17 -0800
Subject: [PATCH] fix conflicts

---
 src/components/projects/QP.astro | 10 +++++-----
 src/pages/find.astro             | 14 ++++++--------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/components/projects/QP.astro b/src/components/projects/QP.astro
index 74eee7b..79482bc 100644
--- a/src/components/projects/QP.astro
+++ b/src/components/projects/QP.astro
@@ -13,12 +13,12 @@ import { IoIosArrowDroprightCircle } from "react-icons/io";
   </div>
   <div class="w-[70vw] aspect-[2.5/1] relative">
     <div id="qp-skeleton" class="skeleton absolute inset-0 rounded-full z-0">
+      <Image
+        src={qp}
+        alt="qp showcase photo"
+        class="md:w-[70vw] w-[85vw] md:aspect-[2.5/1] aspect-[2.5/1.2] rounded-full"
+      />
     </div>
-    <Image
-      src={qp}
-      alt="qp showcase photo"
-      class="md:w-[70vw] w-[85vw] md:aspect-[2.5/1] aspect-[2.5/1.2] rounded-full"
-    />
   </div>
   <Link
     data-inview
diff --git a/src/pages/find.astro b/src/pages/find.astro
index c1b7a5b..093a4b7 100644
--- a/src/pages/find.astro
+++ b/src/pages/find.astro
@@ -21,13 +21,11 @@ import contactbroder from "../images/contactbroder.webp";
   />
   <FindTitle />
   <div class="w-full flex justify-center">
-    <div class="skeleton w-3/4 rounded-full"></div>
-    <Image
-      src={event}
-      alt="board group photos"
-      class="w-[90%] md:w-3/4 rounded-full"
-    />
+    <div class="skeleton w-3/4 rounded-full">
+      <Image src={event} alt="board group photos" class="w-full rounded-full" />
+    </div>
   </div>
+
+  <Findus />
+  <Social />
 </Layout>
-<Findus />
-<Social />