From 07bceed057082fcbc84e94e5f6ebc827caa067df Mon Sep 17 00:00:00 2001 From: cewei8483 <cewei8483@gmail.com> Date: Wed, 26 Jul 2023 11:33:19 +0100 Subject: [PATCH 1/5] add padding above button --- frontend/src/pages/studentDashboard/joinSchool/JoinSchool.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/pages/studentDashboard/joinSchool/JoinSchool.tsx b/frontend/src/pages/studentDashboard/joinSchool/JoinSchool.tsx index 8dad7462..d5caab41 100644 --- a/frontend/src/pages/studentDashboard/joinSchool/JoinSchool.tsx +++ b/frontend/src/pages/studentDashboard/joinSchool/JoinSchool.tsx @@ -82,7 +82,7 @@ const JoinSchool: React.FC = () => { required /> - <Stack direction='row' spacing={2}> + <Stack direction='row' spacing={2} paddingY={1}> <Button variant='outlined' onClick={() => { navigate(-1); }} From 9a9b47e8310b85124f3f7f1e3ca69dcf8a9a053a Mon Sep 17 00:00:00 2001 From: cewei8483 <cewei8483@gmail.com> Date: Wed, 26 Jul 2023 11:43:27 +0100 Subject: [PATCH 2/5] edit buttons in StudentAccount as well --- frontend/src/pages/studentDashboard/account/StudentAccount.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/pages/studentDashboard/account/StudentAccount.tsx b/frontend/src/pages/studentDashboard/account/StudentAccount.tsx index f88a6994..58e0b893 100644 --- a/frontend/src/pages/studentDashboard/account/StudentAccount.tsx +++ b/frontend/src/pages/studentDashboard/account/StudentAccount.tsx @@ -64,7 +64,7 @@ const AccountFormButtons: React.FC = () => { const navigate = useNavigate(); return <> - <Stack direction='row' spacing={2}> + <Stack direction='row' spacing={2} paddingY={1}> <Button variant='outlined' onClick={() => { navigate(-1); }} From 8bbf5256039f15fb7e7acf0dd403f79a4a00bbf8 Mon Sep 17 00:00:00 2001 From: cewei8483 <cewei8483@gmail.com> Date: Wed, 26 Jul 2023 12:06:57 +0100 Subject: [PATCH 3/5] increase padding from Laura's feedback --- frontend/src/features/deleteAccountForm/DeleteAccountForm.tsx | 2 +- frontend/src/pages/studentDashboard/account/StudentAccount.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/features/deleteAccountForm/DeleteAccountForm.tsx b/frontend/src/features/deleteAccountForm/DeleteAccountForm.tsx index 429c85a5..7525468a 100644 --- a/frontend/src/features/deleteAccountForm/DeleteAccountForm.tsx +++ b/frontend/src/features/deleteAccountForm/DeleteAccountForm.tsx @@ -66,7 +66,7 @@ const DeleteAccountForm: React.FC<DeleteAccountFormProps> = ({ }); }} > - <Grid container columnSpacing={4}> + <Grid container columnSpacing={4} paddingBottom={3}> <Grid xs={12} sm={6}> <PasswordField placeholder='Current password' diff --git a/frontend/src/pages/studentDashboard/account/StudentAccount.tsx b/frontend/src/pages/studentDashboard/account/StudentAccount.tsx index 58e0b893..ee8d3d60 100644 --- a/frontend/src/pages/studentDashboard/account/StudentAccount.tsx +++ b/frontend/src/pages/studentDashboard/account/StudentAccount.tsx @@ -64,7 +64,7 @@ const AccountFormButtons: React.FC = () => { const navigate = useNavigate(); return <> - <Stack direction='row' spacing={2} paddingY={1}> + <Stack direction='row' spacing={2} paddingY={3}> <Button variant='outlined' onClick={() => { navigate(-1); }} From 334ecf3d0f755c3e0c7b05cc416012e884957fb5 Mon Sep 17 00:00:00 2001 From: cewei8483 <cewei8483@gmail.com> Date: Wed, 26 Jul 2023 12:07:34 +0100 Subject: [PATCH 4/5] JoinSchool --- frontend/src/pages/studentDashboard/joinSchool/JoinSchool.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/pages/studentDashboard/joinSchool/JoinSchool.tsx b/frontend/src/pages/studentDashboard/joinSchool/JoinSchool.tsx index d5caab41..2a2126de 100644 --- a/frontend/src/pages/studentDashboard/joinSchool/JoinSchool.tsx +++ b/frontend/src/pages/studentDashboard/joinSchool/JoinSchool.tsx @@ -82,7 +82,7 @@ const JoinSchool: React.FC = () => { required /> - <Stack direction='row' spacing={2} paddingY={1}> + <Stack direction='row' spacing={2} paddingY={3}> <Button variant='outlined' onClick={() => { navigate(-1); }} From d1508af44bc81550f08f2b0bc1b41f89d0fb8953 Mon Sep 17 00:00:00 2001 From: cewei8483 <cewei8483@gmail.com> Date: Wed, 26 Jul 2023 14:22:56 +0100 Subject: [PATCH 5/5] add padding to EmailForm --- frontend/src/pages/resetPassword/EmailForm.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/pages/resetPassword/EmailForm.tsx b/frontend/src/pages/resetPassword/EmailForm.tsx index a1c38416..e10df4f0 100644 --- a/frontend/src/pages/resetPassword/EmailForm.tsx +++ b/frontend/src/pages/resetPassword/EmailForm.tsx @@ -84,6 +84,7 @@ const EmailForm: React.FC<EmailFormProps> = ({ direction='row' gap={5} justifyContent='center' + paddingY={3} > <Button variant='outlined'