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

Swap pics for the home and about page #30

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
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
24 changes: 12 additions & 12 deletions pages/about.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export default function About(props: Props) {
x="55%"
y="20%"
size={300}
image="./about.jpg"
image="./horizons_helpdesk.jpg"
rotation={15}
imgOffsetX={0}
imgOffsetY={0}
Expand Down Expand Up @@ -148,7 +148,7 @@ export default function About(props: Props) {
y="-15%"
transform="translate(-50%, 0px)"
size={120}
image="./about-exec.jpg"
image="./exec_team.jpg"
color="transparent"
rotation={40}
imgOffsetX={0}
Expand All @@ -162,7 +162,7 @@ export default function About(props: Props) {
y="-50%"
transform="translate(50%, 50%)"
size={300}
image="./about-exec.jpg"
image="./exec_team.jpg"
color="transparent"
borderSize={5}
borderColor="rgba(51,194,255,0.3)"
Expand Down Expand Up @@ -195,7 +195,7 @@ export default function About(props: Props) {
y="-15%"
transform="translate(-50%, 0px)"
size={120}
image="./about-design.jpg"
image="./design_team_pic.jpg"
color="transparent"
rotation={35}
imgOffsetX={0}
Expand All @@ -208,7 +208,7 @@ export default function About(props: Props) {
x="65%"
y="-0%"
size={300}
image="./about-design.jpg"
image="./design_team_pic.jpg"
color="transparent"
borderSize={5}
borderColor="rgba(51,194,255,0.3)"
Expand Down Expand Up @@ -255,7 +255,7 @@ export default function About(props: Props) {
y="-15%"
transform="translate(-50%, 0px)"
size={120}
image="./about-marketing.png"
image="./marketing_team.jpg"
color="transparent"
borderSize={5}
borderColor="rgba(51,194,255,0.3)"
Expand Down Expand Up @@ -289,12 +289,12 @@ export default function About(props: Props) {
x="-25%"
y="-0%"
size={300}
image="./about-marketing.png"
image="./marketing_team.jpg"
color="transparent"
borderSize={5}
borderColor="rgba(51,194,255,0.3)"
rotation={20}
imgOffsetX={0}
imgOffsetX={-1}
imgOffsetY={0}
/>
</>
Expand Down Expand Up @@ -381,7 +381,7 @@ export default function About(props: Props) {
y="-15%"
transform="translate(-50%, 0px)"
size={120}
image="./about-tech.png"
image="./tech_team.jpg"
color="transparent"
rotation={35}
imgOffsetX={0}
Expand All @@ -395,7 +395,7 @@ export default function About(props: Props) {
x="60%"
y="20%"
size={300}
image="./about-tech.png"
image="./tech_team.jpg"
color="transparent"
borderSize={5}
borderColor="rgba(51,194,255,0.3)"
Expand Down Expand Up @@ -434,7 +434,7 @@ export default function About(props: Props) {
y="-15%"
transform="translate(-50%, 0px)"
size={120}
image="./about-ops.png"
image="./ops_team.jpg"
color="transparent"
rotation={35}
imgOffsetX={0}
Expand Down Expand Up @@ -467,7 +467,7 @@ export default function About(props: Props) {
x="-15%"
y="-0%"
size={300}
image="./about-ops.png"
image="./ops_team.jpg"
color="transparent"
borderSize={5}
borderColor="rgba(51,194,255,0.3)"
Expand Down
8 changes: 5 additions & 3 deletions pages/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,11 @@ export default function Home(props: Props) {
x="40%"
y="-50%"
size={475}
image="/splash.png"
image="/hackgt8_peace.jpg"
imageDy={300}
rotation={45}
imgOffsetX={-80}
imgOffsetY={-70}
/>

{/* bottom left */}
Expand Down Expand Up @@ -150,7 +152,7 @@ export default function Home(props: Props) {
</Text>
<SimpleGrid columns={[1, 1, 2]} spacing="40px">
<InitiativeCard
coverImage="home-intouch-involved.jpg"
coverImage="get_involved_card.JPG"
coverImageAlt="People smiling"
heading="Getting Involved"
body="Learn more about how you can get involved with HexLabs as an
Expand All @@ -163,7 +165,7 @@ export default function Home(props: Props) {
/>

<InitiativeCard
coverImage="home-discord.jpg"
coverImage="beardells.jpg"
coverImageAlt="Guy looking in mirror"
heading="Discord"
body="Join the Hex Commons, a supportive community of like-minded
Expand Down
Binary file added public/HackGT8_group.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/beardells.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/design_team_pic.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/exec_team.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/exec_team_framed.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/get_involved_card.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/hackgt8.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/hackgt8_peace.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/horizons_helpdesk.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/marketing_team.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/marketing_team1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/ops_team.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/tech_team.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.