Merge remote-tracking branch 'origin/frontend' into frontend

SELab-2 · May 20, 2024 · 6d1bc6b · 6d1bc6b
2 parents 6a8a788 + 60eb45d
commit 6d1bc6b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/frontend/frontend/src/components/SubmissionListItemStudentPage.tsx b/frontend/frontend/src/components/SubmissionListItemStudentPage.tsx
@@ -51,9 +51,9 @@ export function SubmissionListItemStudentPage({
 
     return (
         <>
-            <ListItem key={realId} sx={{ maxHeight: '30px' }} disablePadding>
+            <ListItem key={realId} sx={{ maxHeight: '40px' }} disablePadding>
                 <ListItemButton
-                    sx={{ maxHeight: '30px' }}
+                    sx={{ maxHeight: '40px' }}
                     onClick={handleSubmissionClick}
                 >
                     <EvenlySpacedRow

diff --git a/frontend/frontend/src/components/SubmissionListItemTeacherPage.tsx b/frontend/frontend/src/components/SubmissionListItemTeacherPage.tsx
@@ -136,9 +136,9 @@ export function SubmissionListItemTeacherPage({
 
     return (
         <>
-            <ListItem id={group_id} sx={{ maxHeight: '30px' }} disablePadding>
+            <ListItem id={group_id} sx={{ maxHeight: '40px' }} disablePadding>
                 <ListItemButton
-                    sx={{ maxHeight: '30px' }}
+                    sx={{ maxHeight: '40px' }}
                     onClick={handleSubmissionClick}
                 >
                     <EvenlySpacedRow

diff --git a/frontend/frontend/src/pages/subjectsPage/AddChangeSubjectPage.tsx b/frontend/frontend/src/pages/subjectsPage/AddChangeSubjectPage.tsx
@@ -78,6 +78,7 @@ function UserList(
                             }
                             return (
                                 <>
+                                    <Divider />
                                     <ListItem>
                                         <EvenlySpacedRow
                                             items={[
@@ -126,7 +127,7 @@ function UserList(
                                             ]}
                                         />
                                     </ListItem>
-                                    <Divider />
+
                                 </>
                             )
                         })}
@@ -650,10 +651,9 @@ export function AddChangeSubjectPage() {
                                                             {t('students')}
                                                         </Typography>
                                                     </Box>
-                                                    <Divider />
                                                     <Box
                                                         sx={{
-                                                            marginTop: -2.5,
+                                                            marginTop: -3.1,
                                                         }}
                                                     >
                                                         {UserList(
@@ -700,10 +700,9 @@ export function AddChangeSubjectPage() {
                                                             {t('teachers')}
                                                         </Typography>
                                                     </Box>
-                                                    <Divider />
                                                     <Box
                                                         sx={{
-                                                            marginTop: -2.5,
+                                                            marginTop: -3.1,
                                                         }}
                                                     >
                                                         {UserList(

diff --git a/frontend/frontend/src/pages/subjectsPage/AssignmentListItemSubjectsPage.tsx b/frontend/frontend/src/pages/subjectsPage/AssignmentListItemSubjectsPage.tsx
@@ -76,10 +76,10 @@ export function AssignmentListItemSubjectsPage({
                 id={projectName.replace(/\s/g, '')}
                 key={projectName}
                 disablePadding
-                sx={{ maxHeight: '30px' }}
+                sx={{ maxHeight: '40px' }}
             >
                 <ListItemButton
-                    sx={{ maxHeight: '30px' }}
+                    sx={{ maxHeight: '40px' }}
                     onClick={handleProjectClick}
                 >
                     {isStudent ? (