Skip to content

Commit cdfc488

Browse files
authored
Merge branch 'develop' into #1374-BenjaminZhu-credits
2 parents 0c87793 + f2380b5 commit cdfc488

1 file changed

Lines changed: 20 additions & 1 deletion

File tree

src/frontend/src/pages/CreditsPage/CreditsPage.tsx

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ const CreditsPage: React.FC = () => {
8484
{ name: 'Yechan Na', color: '#C2B078' },
8585
{ name: 'Liam Kosar', color: '#eb66ff' },
8686
{ name: 'Daniel Yu', color: '#bdc0c7' },
87+
{ name: 'Jake Wu-Chen', color: '#bdc0c7' },
8788
{ name: 'William Seward', color: '#e53774' },
8889
{
8990
name: 'Zach Norman',
@@ -95,15 +96,33 @@ const CreditsPage: React.FC = () => {
9596
},
9697
{ name: 'Ethan Mouri', color: '#00bbff' },
9798
{ name: 'Laith Taher', color: '#000080' },
99+
{ name: 'Teera Tesharojanasup', color: '#DC143C', sx: { px: 1, backgroundColor: '#E8D8CC', borderRadius: 10 } },
100+
{ name: 'Griffin Cooper', color: '#02d69a' },
98101
{ name: 'Amani Scarborough', color: '#e34db6' },
99102
{ name: 'Peter Moise', color: '#FF0000' },
100103
{ name: 'Srihari Raman', color: '#FF2400' },
101104
{ name: 'Kaiyang Zheng', color: '#FFFF00' },
102105
{ name: 'Waasif Mahmood', color: '#114a13' },
103106
{ name: 'Matthew Wang', color: '#c657f2' },
104107
{ name: 'Sharon Yang', color: '#ed8a5f' },
108+
{ name: 'Benjamin Zhu', color: '#ccccff' },
109+
{ name: 'Stephanie Xu', color: '#ffcd42' },
110+
{ name: 'Hareg Aderie', color: '#34b46c' },
105111
{ name: 'Kevin Polackal', color: '#800080' },
106-
{ name: 'Benjamin Zhu', color: '#ccccff' }
112+
{ name: 'Raghav Mathur', color: '#009933' },
113+
{ name: 'Anika Sharma', color: '#ff0000' },
114+
{
115+
name: 'Kaan Tural',
116+
color: 'transparent',
117+
sx: {
118+
background: 'linear-gradient(90deg, rgba(255,0,0,1) 0%, rgba(0,128,255,1) 100%)',
119+
'-webkit-background-clip': 'text',
120+
textShadow: '0 0 5px rgba(255,0,0,1), 0 0 10px rgba(0,128,255,1)'
121+
}
122+
},
123+
{ name: 'Kevin Polackal', color: '#800080' },
124+
{ name: 'Lily Shiomitsu', color: '#008080' },
125+
{ name: 'Kevin Yang', color: '#0000FF' }
107126
];
108127

109128
const snark = ['Add your name!', "Shouldn't you do it yourself?", 'Seriously', 'go', 'do', 'it'];

0 commit comments

Comments
 (0)