Merge branch 'develop' into #1631-BradfordDerby-credits

Author: bderbs30

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

@@ -145,6 +145,7 @@ const CreditsPage: React.FC = () => {
     { name: 'Megan Lai', color: '#52B2BF' },
     { name: 'Eric Sun', color: '#FCCAED' },
     { name: 'Yash Jayaprakash', color: '#66b2b2' },
+    { name: 'Maggie Chua', color: '#E6E6FA' },
     { name: 'Bradford Derby', color: '#577DD5' }
   ];
 

src/frontend/src/pages/TeamsPage/TeamMembersPageBlock.tsx

@@ -179,32 +179,32 @@ const TeamMembersPageBlock: React.FC<TeamMembersPageBlockProps> = ({ team }) =>
 
   const NonEditingHeadView = () => (
     <Grid container>
-      <Grid item>
+      <Grid item xs={11}>
         <DetailDisplay label="Head" content={fullNamePipe(team.head)} />
       </Grid>
-      <Grid item mt={-1}>
+      <Grid item xs={1} mt={-1} display={'flex'} justifyContent={'flex-end'}>
         {hasPerms && <IconButton children={<Edit />} onClick={() => setIsEditingHead(true)} />}
       </Grid>
     </Grid>
   );
 
   const NonEditingLeadsView = () => (
     <Grid container>
-      <Grid item xs={11} lg="auto">
+      <Grid item xs={11}>
         <DetailDisplay label="Leads" content={team.leads.map((lead) => fullNamePipe(lead)).join(', ')} />
       </Grid>
-      <Grid item xs={1} mt={-1}>
+      <Grid item xs={1} mt={-1} display={'flex'} justifyContent={'flex-end'}>
         {hasPerms && <IconButton children={<Edit />} onClick={() => setIsEditingLeads(true)} />}
       </Grid>
     </Grid>
   );
 
   const NonEditingMembersView = () => (
     <Grid container>
-      <Grid item xs={11} lg="auto">
+      <Grid item xs={11}>
         <DetailDisplay label="Members" content={team.members.map((member) => fullNamePipe(member)).join(', ')} />
       </Grid>
-      <Grid item xs={1} mt={-1}>
+      <Grid item xs={1} mt={-1} display={'flex'} justifyContent={'flex-end'}>
         {hasPerms && <IconButton children={<Edit />} onClick={() => setIsEditingMembers(true)} />}
       </Grid>
     </Grid>