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.

Sign up for GitHub

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 #114

Merged
merged 2 commits into from
Nov 26, 2023
Merged

merge to main #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29c0514
fix md
menthy-wu Nov 26, 2023
f0783c3
Merge pull request #113 from acm-ucr/menthy/home
menthy-wu Nov 26, 2023
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/app/about/page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import img2 from "../../../public/images/AboutPic2.webp";

const page = () => {
return (
<div className="py-20 w-10/12 md:w-1/2 flex flex-col items-center gap-3">
<div className="py-20 w-10/12 md:w-2/3 lg:w-1/2 flex flex-col items-center gap-3">
<Title subTitle="LEARN WHO WE ARE" title="ABOUT US" />
<img
className="w-full"
Expand Down
2 changes: 1 addition & 1 deletion src/components/home/About.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import img1 from "../../../public/images/About.webp";

const About = () => {
return (
<div className="w-10/12 md:w-1/2 flex flex-col items-center gap-10">
<div className="w-10/12 md:w-2/3 lg:w-1/2 flex flex-col items-center gap-10">
<div className="absolute w-1/3 aspect-square bg-ewb-blue-100/40 rounded-full -translate-y-14" />
<Title subTitle="LEARN WHO WE ARE" title="ABOUT US" />
<div className="relative text-center w-full">
Expand Down
2 changes: 1 addition & 1 deletion src/components/home/Events.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Title from "../Title";

const Events = () => {
return (
<div className="w-10/12 md:w-1/2 flex flex-col items-center gap-10">
<div className="w-10/12 md:w-2/3 lg:w-1/2 flex flex-col items-center gap-10">
<div className="absolute w-1/3 aspect-square bg-ewb-blue-100/40 rounded-full -translate-y-14" />
<Title subTitle="CHECK OUT WHAT IS NEW" title="UPCOMING EVENTS" />
{EVENTS.map((event, index) => (
Expand Down
2 changes: 1 addition & 1 deletion src/components/home/Join.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Title from "../Title";
import Social from "./Social";
const Join = () => {
return (
<div className="w-10/12 md:w-1/2 flex flex-col items-center gap-10 mb-20">
<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="JOIN US AND GET INVOLVED" title="JOIN US" />
<Social />
Expand Down
2 changes: 1 addition & 1 deletion src/components/home/Projects.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Project from "@/components/home/Project";

const Projects = () => {
return (
<div className="w-10/12 md:w-1/2 flex flex-col items-center gap-10">
<div className="w-10/12 md:w-2/3 lg:w-1/2 flex flex-col items-center gap-10">
<div className="absolute w-1/3 aspect-square bg-ewb-blue-100/40 rounded-full -translate-y-14" />
<Title subTitle="LEARN FROM EXPERIENCE" title="OUR PROJECTS" />
<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
Expand Down
2 changes: 1 addition & 1 deletion src/components/home/WhyJoin.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Picture from "../Picture";
import img1 from "../../../public/images/whyJoin.webp";
const WhyJoin = () => {
return (
<div className="w-10/12 md:w-1/2 flex flex-col items-center gap-10">
<div className="w-10/12 md:w-2/3 lg:w-1/2 flex flex-col items-center gap-10">
<div className="absolute w-1/3 aspect-square bg-ewb-blue-100/40 rounded-full -translate-y-14" />
<Title subTitle="GET INVOLVED AND MAKE AN IMPACT!" title="WHY JOIN EWB" />
<div className="relative text-center w-full">
Expand Down