Merge pull request #139 from acm-ucr/dev

merge to main
acm-ucr · Dec 22, 2023 · fcbd0c4 · fcbd0c4
2 parents 895fcc1 + b93f566
commit fcbd0c4
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/src/components/Footer.jsx b/src/components/Footer.jsx
@@ -7,7 +7,7 @@ import { LINKS } from "@/data/links";
 const Footer = () => {
   return (
     <div className="w-full bg-ewb-blue-200 border-t-[20px] border-t-ewb-green pt-8 flex justify-between relative">
-      <div className="flex itemrs-end m-3 gap-3 text-white font-bold text-xl w-1/2">
+      <div className="flex items-end m-3 gap-3 text-white font-bold text-xl w-1/2">
         <Image src={whiteLogo} alt="EWB Logo" />
         <p className="text-xs md:text-lg">EWB at UCR</p>
       </div>

diff --git a/src/components/events/EventDescription.jsx b/src/components/events/EventDescription.jsx
@@ -13,7 +13,7 @@ const EventDescription = ({ event, index }) => {
         {event.summary}
       </div>
       <div className="flex flex-row w-full -translate-x-2 md:-translate-x-10">
-        <div className="h-2.5 w-2.5 rotate-45 bg-pad-purple" />
+        <div className="h-2.5 w-2.5 rotate-45" />
         <div className="translate-y-1 h-0.5 w-36 bg-ewb-blue-100" />
       </div>
 

diff --git a/src/components/events/Modal.jsx b/src/components/events/Modal.jsx
@@ -3,7 +3,7 @@ import { AiOutlinePlus } from "react-icons/ai";
 
 const Modal = ({ event, setEvent }) => {
   return (
-    <div className="fixed top-[56%] left-1/2 -translate-x-1/2 -translate-y-1/2 w-[75vw] md:w-[50vw] bg-pad-beige z-10 drop-shadow-lg">
+    <div className="fixed top-[56%] left-1/2 -translate-x-1/2 -translate-y-1/2 w-[75vw] md:w-[50vw] z-10 drop-shadow-lg">
       <div
         className={`flex justify-between items-center ${
           COLORS[event.color].bg

diff --git a/src/components/home/Join.jsx b/src/components/home/Join.jsx
@@ -3,7 +3,6 @@ import Social from "./Social";
 const Join = () => {
   return (
     <div className="w-10/12 md:w-2/3  lg:w-1/2 flex flex-col items-center gap-10 mb-20">
-      <div className="absolute w-1/3 aspect-square bg-ewb-blue-100/40 rounded-full -translate-y-14" />
       <Title subTitle="GET INVOLVED" title="JOIN US" />
       <Social />
     </div>