Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge to main #139

Merged
merged 3 commits into from
Dec 22, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/Footer.jsx
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion src/components/events/EventDescription.jsx
Original file line number Diff line number Diff line change
@@ -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>

2 changes: 1 addition & 1 deletion src/components/events/Modal.jsx
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion src/components/home/Join.jsx
Original file line number Diff line number Diff line change
@@ -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>