fix conflicts

This commit is contained in:
chark1es 2025-01-27 10:40:17 -08:00
parent 055cbb67c0
commit 53da43fa05
2 changed files with 11 additions and 13 deletions

View file

@ -13,12 +13,12 @@ import { IoIosArrowDroprightCircle } from "react-icons/io";
</div> </div>
<div class="w-[70vw] aspect-[2.5/1] relative"> <div class="w-[70vw] aspect-[2.5/1] relative">
<div id="qp-skeleton" class="skeleton absolute inset-0 rounded-full z-0"> <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> </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> </div>
<Link <Link
data-inview data-inview

View file

@ -21,13 +21,11 @@ import contactbroder from "../images/contactbroder.webp";
/> />
<FindTitle /> <FindTitle />
<div class="w-full flex justify-center"> <div class="w-full flex justify-center">
<div class="skeleton w-3/4 rounded-full"></div> <div class="skeleton w-3/4 rounded-full">
<Image <Image src={event} alt="board group photos" class="w-full rounded-full" />
src={event} </div>
alt="board group photos"
class="w-[90%] md:w-3/4 rounded-full"
/>
</div> </div>
<Findus />
<Social />
</Layout> </Layout>
<Findus />
<Social />