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

Jump to bottom

merge to main #112

Merged
merged 56 commits into from
Nov 26, 2023
Merged

merge to main #112

merged 56 commits into from
Nov 26, 2023

Conversation

menthy-wu
Copy link
Contributor

No description provided.

Fuyuki325 and others added 30 commits November 16, 2023 17:06
@Fuyuki325
Mobile Responsive Costa Rica
6a82734
added WaterQualityAndFiltrationProject
c698ca1
added WaterQuality
9f064fa
@stanleylew5
added why join section + small changes to focus.jsx to fix grid conte…
a4ef95e 
…nt layout
@AgentEinstein
Created About Page
102b4a4
added WaterQuality
1283731
@menthy-wu
fix projecrs
64f7bfc
@stanleylew5
made changes
50aba20
@Fuyuki325
Removed unneeded imports on page.js
2463a09
@stanleylew5
z-20 instead of z-10
febcdc8
@Fuyuki325
Restored page.js to normal
29644b8
@stanleylew5
formatting
49d24ca
added water quality
af2f4d9
@menthy-wu
Merge pull request #86 from acm-ucr/stanley/focusSection
9b5f551 
stanley/whyjoin
@menthy-wu
Merge pull request #92 from acm-ucr/menthy/fix
806c470 
fix projecrs
@Fuyuki325
Fixed import for img2
10e02ab
@menthy-wu
Merge pull request #88 from acm-ucr/dylan/WaterQualityAndFiltrationPr…
49d5fed 
…oject

Dylan/water quality and filtration project
@menthy-wu
add water
8bd872b
@menthy-wu
Merge pull request #84 from acm-ucr/Fuyuki/Mobile-Costa
3dd2967 
Fuyuki/Mobile-Responsive-Costa-Rica
@menthy-wu
Merge branch 'dev' of https://github.com/acm-ucr/ewb-website into dev
9aa7d2e
@stanleylew5
robotics page added
aed6630
@menthy-wu
Merge pull request #96 from acm-ucr/menthy/water
7f167e0 
add water
@menthy-wu
Merge pull request #98 from acm-ucr/stanley/robotics
73ab7d2 
stanley/robotics
@stanleylew5
forgot to format again whoopsies
ed7365a
@stanleylew5
made changes
9e6568e
@menthy-wu
Merge pull request #99 from acm-ucr/stanley/mobileResponsivenessFocus…
96582dc 
…Section

stanley / mobile responsiveness for focus section
@menthy-wu
Merge branch 'dev' of https://github.com/acm-ucr/ewb-website into dev
422ac93
@menthy-wu
add picture
4be9eaa
@menthy-wu
fix board
58285aa
@stanleylew5
fixed focus + added pic
25044f9
stanleylew5 and others added 26 commits November 20, 2023 01:04
@stanleylew5
removed padding from nav bar
c6457de
@Kevinloritsch
kevin/tanzaniaMobile
166bb54
@Fuyuki325
Added About
12cf590
@AgentEinstein
Merge branch 'dev' of https://github.com/acm-ucr/ewb-website into Age…
3c01771 
…ntEinstein/About
@AgentEinstein
fixed small changes involving div removal and self closing
08fe8a6
@AgentEinstein
Landing page now responsive on most mobile phones
a01fc22
@dylanwong6605
added board mobile responsiveness
062efed
@dylanwong6605
added mobile responsive board
70952d1
@menthy-wu
Merge pull request #107 from acm-ucr/dylan/MobileResponseBoard
7220932 
added board mobile responsiveness
@menthy-wu
Merge pull request #102 from acm-ucr/stanley/whyjoin
46f0bac 
stanley/whyjoin
@menthy-wu
Merge pull request #103 from acm-ucr/stanley/navbar
c87b6b9 
stanley/navbar
@menthy-wu
delete useless file
9f46480
@menthy-wu
Merge pull request #106 from acm-ucr/AgentEinstein/LandingPage
b70b2cd 
Landing page now responsive on most mobile phones
@menthy-wu
fix about page
3c6e32b
@menthy-wu
fix about
b9115d1
@menthy-wu
Merge pull request #104 from acm-ucr/kevin/tanzaniaMobile
c2d985a 
kevin/tanzaniaMobile
@menthy-wu
fix about page
fbc9dda
@menthy-wu
Merge branch 'dev' of https://github.com/acm-ucr/ewb-website into Age…
e2f4139 
…ntEinstein/About
@menthy-wu
Merge branch 'AgentEinstein/About' of https://github.com/acm-ucr/ewb-…
be02dd3 
…website into AgentEinstein/About
@menthy-wu
fix about
be53a88
@menthy-wu
revert abotu section
0c548d2
@menthy-wu
Merge pull request #105 from acm-ucr/Fuyuki/About
2835453 
Fuyuki/About
@menthy-wu
Merge pull request #87 from acm-ucr/AgentEinstein/About
e6c7078 
Created About Page
@menthy-wu
fix home page
dbccd40
@menthy-wu
add duration
32f808b
@menthy-wu
Merge pull request #108 from acm-ucr/menthy/home
10dc56f 
fix home page
@menthy-wu menthy-wu merged commit c724c72 into main Nov 26, 2023
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@menthy-wu @Fuyuki325 @stanleylew5 @AgentEinstein @Kevinloritsch @dylanwong6605