Skip to content

Commit 277f21c

Browse files
authored
Merge branch 'develop' into #1379-AaravShyamkumar-credits
2 parents d295545 + 4df5b56 commit 277f21c

1 file changed

Lines changed: 19 additions & 3 deletions

File tree

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

Lines changed: 19 additions & 3 deletions
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,6 +96,7 @@ 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 } },
98100
{ name: 'Griffin Cooper', color: '#02d69a' },
99101
{ name: 'Amani Scarborough', color: '#e34db6' },
100102
{ name: 'Peter Moise', color: '#FF0000' },
@@ -103,11 +105,25 @@ const CreditsPage: React.FC = () => {
103105
{ name: 'Waasif Mahmood', color: '#114a13' },
104106
{ name: 'Matthew Wang', color: '#c657f2' },
105107
{ name: 'Sharon Yang', color: '#ed8a5f' },
106-
{ name: 'Kevin Polackal', color: '#800080' },
108+
{ name: 'Benjamin Zhu', color: '#ccccff' },
107109
{ name: 'Stephanie Xu', color: '#ffcd42' },
108110
{ name: 'Hareg Aderie', color: '#34b46c' },
109-
{ name: 'Kevin Yang', color: '#0000FF' },
110-
{ name: 'Aarav Shyamkumar', color: '#FF0000' }
111+
{ name: 'Aarav Shyamkumar', color: '#FF0000' },
112+
{ name: 'Kevin Polackal', color: '#800080' },
113+
{ name: 'Raghav Mathur', color: '#009933' },
114+
{ name: 'Anika Sharma', color: '#ff0000' },
115+
{
116+
name: 'Kaan Tural',
117+
color: 'transparent',
118+
sx: {
119+
background: 'linear-gradient(90deg, rgba(255,0,0,1) 0%, rgba(0,128,255,1) 100%)',
120+
'-webkit-background-clip': 'text',
121+
textShadow: '0 0 5px rgba(255,0,0,1), 0 0 10px rgba(0,128,255,1)'
122+
}
123+
},
124+
{ name: 'Kevin Polackal', color: '#800080' },
125+
{ name: 'Lily Shiomitsu', color: '#008080' },
126+
{ name: 'Kevin Yang', color: '#0000FF' }
111127
];
112128

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

0 commit comments

Comments
 (0)