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

Dev #26

Merged
merged 30 commits into from
Sep 27, 2024
Merged

Dev #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
f8e14ce
Add project wireframes
seasew Aug 23, 2024
7b441e9
Make updates
seasew Aug 23, 2024
01b7637
Add discord link to landing
seasew Aug 23, 2024
642cbc9
Change color-grading on images
seasew Aug 23, 2024
19632ba
Merge branch 'master' into dev
seasew Aug 23, 2024
b0d428e
Add gradient line; upload headshots
seasew Aug 24, 2024
0ecc175
Replace boilermaker gold with old gold color
seasew Aug 24, 2024
1ba8cab
Add gtags, fix some console errors
seasew Sep 1, 2024
9f8756c
Update calendar; add cfturbo sponsor logo
seasew Sep 1, 2024
8d18063
Merge branch 'master' into dev
seasew Sep 1, 2024
06c8e13
Change verification gtag
seasew Sep 2, 2024
67357c8
Merge branch 'master' into dev
seasew Sep 2, 2024
2464837
Merge branch 'master' into dev
seasew Sep 2, 2024
037f967
Modify caleander
seasew Sep 3, 2024
4cb293e
Change the number of members
seasew Sep 4, 2024
1a13f4e
Update landing
seasew Sep 4, 2024
60d431e
Merge branch 'master' into dev
seasew Sep 4, 2024
e49b6c0
Update readme
seasew Sep 8, 2024
d1029de
Add Donate/Contact form
seasew Sep 14, 2024
8f4b79e
Merge branch 'readme' into dev
seasew Sep 14, 2024
36246ff
Merge branch 'master' into dev
seasew Sep 14, 2024
48140a7
revert contact page
seasew Sep 17, 2024
eeab43c
Update contact page
seasew Sep 18, 2024
d24b1d8
Merge branch 'master' into dev
seasew Sep 18, 2024
ca1b522
Fix formatting on Contact page
seasew Sep 18, 2024
0d72efb
modify launch.json
Sep 18, 2024
f84bd2d
Merge branch 'master' into dev
Sep 18, 2024
d74a267
Merge branch 'dev' into allison
Sep 18, 2024
ec66ec8
updated team page
Sep 27, 2024
367807d
Merge pull request #25 from PURPL-Purdue/allison
allisonmmau Sep 27, 2024
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
15 changes: 15 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "chrome",
"request": "launch",
"name": "Launch Chrome against localhost",
"url": "http://localhost:8080",
"webRoot": "${workspaceFolder}"
}
]
}
2 changes: 1 addition & 1 deletion src/pages/Contact.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const Contact = () => {
</Banner>
<ContentWrapper>
<div className="lg:w-[950px] flex flex-col w-full space-y-8 md:space-y-10">
<div className="flex flex-col items-center space-y-8 md:space-y-14">
<div className="flex flex-col items-center space-y-8 md:space-y-14 my-4 lg:my-8 ">
<div className="flex flex-col h-full text-white font-display text-lg md:text-xl text-center space-y-2">
<p className="text-balance">
<span className="">Email: </span>
Expand Down
6 changes: 3 additions & 3 deletions src/pages/Team.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,10 @@ function Team() {
},
{
imagePath: tempProfilePic,
name: "Madeline Taylor",
name: "Indrajeet Nair",
title: "Electric Propulsion Lead",
image1: "DSC03317.jpg",
image2: "DSC03319.jpg",
image1: "DSC03331.jpg",
image2: "DSC03329.jpg",
//email: "[email protected]"
},
{
Expand Down
Loading