Skip to content

Commit

Permalink
Merge branch 'main' into hcb
Browse files Browse the repository at this point in the history
  • Loading branch information
malted authored Aug 31, 2023
2 parents f21528b + 48fbcdb commit 9e5ea0e
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 2 deletions.
11 changes: 10 additions & 1 deletion lib/carousel.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,15 @@
"img": "https://cloud-7xyxcf3f6-hack-club-bot.vercel.app/0new_project__3_.png",
"link": "https://jams.hackclub.com"
},
{
"background": "#212529",
"titleColor": "white",
"descriptionColor": "white",
"title": "cpu.land",
"description": "Curious exactly what happens when you run a program on your computer? Read this.",
"img": "https://cloud-eg2ex8nol-hack-club-bot.vercel.app/0favicon-on-light-removebg-preview.png",
"link": "https://cpu.land"
},
{
"background": "#000",
"titleColor": "yellow",
Expand Down Expand Up @@ -93,7 +102,7 @@
"background": "dark",
"titleColor": "blue",
"textColor": "white",
"title": "Haxidraw",
"title": "Haxidraw (coming soon!)",
"description": "An open source drawing machine and online editor for generative art",
"img": "https://emoji.slack-edge.com/T0266FRGM/tw_pencil2/c6afadc2280e571d.png",
"link": "https://haxidraw.hackclub.com"
Expand Down
8 changes: 7 additions & 1 deletion pages/team.js
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,13 @@ export default function Team() {
img="https://cloud-oubklmp6c-hack-club-bot.vercel.app/0arianna_profile_photo.png"
pronouns="she/her"
/>

<Bio
name="Ben Dixon"
teamRole="Engineering"
text={`Coming all the way from drizzly England, Ben reconnected with his adoration for teaching people about programming through the computer graphics demoscene during lockdown; firmly believing “GLSL is basically pseudocode”. At Hack Club, Ben designs and implements snazzy new features at HCB, along with raiding their granola bars.`}
img="https://ca.slack-edge.com/T0266FRGM-U03DFNYGPCN-d76abb1ba329-512"
pronouns="he/him"
/>
</Grid>
</Box>

Expand Down
Binary file removed public/stickers/bank_card.png
Binary file not shown.
Binary file removed public/stickers/bank_long_variant_(dark).png
Binary file not shown.
Binary file removed public/stickers/bank_long_variant_(light).png
Binary file not shown.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Binary file added public/team/ben.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 9e5ea0e

Please sign in to comment.