Skip to content

Commit 1a8b2a9

Browse files
Merge branch 'develop' into #3685-RichardFeng-credits
2 parents 19fcce0 + 0b9b521 commit 1a8b2a9

2 files changed

Lines changed: 21 additions & 1 deletion

File tree

src/backend/src/services/notifications.services.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,13 @@ export default class NotificationsService {
265265
type: Reimbursement_Status_Type.SABO_SUBMITTED
266266
}
267267
}
268+
},
269+
{
270+
reimbursementStatuses: {
271+
none: {
272+
type: Reimbursement_Status_Type.DENIED
273+
}
274+
}
268275
}
269276
]
270277
},

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

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,20 @@ const CreditsPage: React.FC = () => {
300300
}
301301
}
302302
},
303-
{ name: 'Richard Feng', color: '#FFFF', sx: { textShadow: '0 0 2px rgba(0,26,255), 0 0 5px rgba(255,255,255)' } }
303+
{ name: 'Richard Feng', color: '#FFFF', sx: { textShadow: '0 0 2px rgba(0,26,255), 0 0 5px rgba(255,255,255)' } },
304+
{
305+
name: 'Samuel Shrestha',
306+
color: '#be0000',
307+
sx: {
308+
textShadow: '0 0 6px rgba(190, 0, 0, 0.9), 0 0 14px rgba(190, 0, 0, 0.6)',
309+
animation: 'sam-glow 2.6s ease-in-out infinite',
310+
'@keyframes sam-glow': {
311+
'0%': { textShadow: '0 0 4px rgba(190, 0, 0, 0.7), 0 0 10px rgba(190, 0, 0, 0.4)' },
312+
'50%': { textShadow: '0 0 10px rgba(190, 0, 0, 1), 0 0 22px rgba(190, 0, 0, 0.95)' },
313+
'100%': { textShadow: '0 0 4px rgba(190, 0, 0, 0.7), 0 0 10px rgba(190, 0, 0, 0.4)' }
314+
}
315+
}
316+
}
304317
];
305318

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

0 commit comments

Comments
 (0)