Webmaster/ieeeucsd-org
3
1
Fork 0
Code Issues 11 Pull requests Projects Releases Packages Wiki Activity Actions

fix the merge bug lol

Browse source
This commit is contained in:
chark1es 2025-01-23 13:54:33 -08:00
parent 001d702729
commit 5d9824155f
1 changed files with 2 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/components/board/Officers.astro
View file

@ -14,27 +14,18 @@ const types = ["All", ...typeOrder];
const currentFilter = "All"; const currentFilter = "All";
--- ---
<<<<<<< HEAD
<div class="text-white flex flex-col items-center md:mt-[10vw] mt-[20vw] mb-[10vh]">
<div data-inview class="relative w-[40vw] md:w-[21vw] in-view:animate-fade-down">
=======
<div <div
class="text-white flex flex-col items-center md:mt-[10vw] mt-[20vw] mb-[10vh]" class="text-white flex flex-col items-center md:mt-[10vw] mt-[20vw] mb-[10vh]"
> >
<div <div
data-inview data-inview
class="relative w-[40vw] md:w-[21vw] in-view:animate-fade-down" class="relative w-[40vw] md:w-[21vw] mb-[10vh] in-view:animate-fade-down"
> >
>>>>>>> chark1es-main
<Image src={about} alt="About background image" /> <Image src={about} alt="About background image" />
<Image <Image
src={neko} src={neko}
alt="About image" alt="About image"
<<<<<<< HEAD
class="absolute top-[10%] left-[16%] aspect-[399/491] object-cover w-[27vw] md:w-[14vw] rounded-[2vw]"
=======
class="absolute top-[10%] left-[16%] aspect-[399/491] object-cover w-[27vw] md:ww-[14vw] rounded-[2vw]" class="absolute top-[10%] left-[16%] aspect-[399/491] object-cover w-[27vw] md:ww-[14vw] rounded-[2vw]"
>>>>>>> chark1es-main
/> />
</div> </div>
@ -43,12 +34,6 @@ const currentFilter = "All";
<p>MEET THE BOARD</p> <p>MEET THE BOARD</p>
</div> </div>
<<<<<<< HEAD
<p class="md:text-[1.3vw] text-[2.5vw] md:w-[56%] w-[70%] my-[3%] font-extralight text-center">
Our board comprises 31 students of varying majors, colleges, and interests! Feel free to reach out for any questions about our position or experiences.
</p>
=======
<p <p
class="md:text-[1.3vw] text-[2.5vw] md:w-[56%] w-[70%] my-[3%] font-extralight text-center" class="md:text-[1.3vw] text-[2.5vw] md:w-[56%] w-[70%] my-[3%] font-extralight text-center"
> >
@ -59,8 +44,7 @@ const currentFilter = "All";
<Filter filters={types} currentFilter={currentFilter} /> <Filter filters={types} currentFilter={currentFilter} />
>>>>>>> chark1es-main <div class="grid gap-[3vw] md:grid-cols-3 grid-cols-2 mt-[2vh]">
<div class="grid gap-[3vw] md:grid-cols-3 grid-cols-2 mt-[10vh]">
{ {
officers.map((officer) => ( officers.map((officer) => (
<div <div