Skip to content

Commit 950f247

Browse files
committed
Merge branch 'develop' into #3864-SathvikCharugundla-credits
2 parents c7c1443 + e61d4e6 commit 950f247

2 files changed

Lines changed: 22 additions & 0 deletions

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: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,21 @@ const CreditsPage: React.FC = () => {
299299
'100%': { backgroundPosition: '0% 200%' }
300300
}
301301
}
302+
},
303+
{ name: 'Saul Manzanares', color: '#AF34FA' },
304+
{ name: 'Richard Feng', color: '#FFFF', sx: { textShadow: '0 0 2px rgba(0,26,255), 0 0 5px rgba(255,255,255)' } },
305+
{
306+
name: 'Samuel Shrestha',
307+
color: '#be0000',
308+
sx: {
309+
textShadow: '0 0 6px rgba(190, 0, 0, 0.9), 0 0 14px rgba(190, 0, 0, 0.6)',
310+
animation: 'sam-glow 2.6s ease-in-out infinite',
311+
'@keyframes sam-glow': {
312+
'0%': { textShadow: '0 0 4px rgba(190, 0, 0, 0.7), 0 0 10px rgba(190, 0, 0, 0.4)' },
313+
'50%': { textShadow: '0 0 10px rgba(190, 0, 0, 1), 0 0 22px rgba(190, 0, 0, 0.95)' },
314+
'100%': { textShadow: '0 0 4px rgba(190, 0, 0, 0.7), 0 0 10px rgba(190, 0, 0, 0.4)' }
315+
}
316+
}
302317
}
303318
];
304319

0 commit comments

Comments
 (0)