fix: 105 new portal edits loginteacher (ocadotechnology#113)

* change padding & subheader font size * merge dev * move padding to js package * upgrade js package
faucomte97 · Jul 28, 2023 · 80339ed · 80339ed
1 parent 15986b8
commit 80339ed
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/frontend/package.json b/frontend/package.json
@@ -28,7 +28,7 @@
     "@mui/icons-material": "^5.11.11",
     "@mui/material": "^5.11.12",
     "@reduxjs/toolkit": "^1.9.3",
-    "codeforlife": "github:ocadotechnology/codeforlife-package-javascript#v1.25.5",
+    "codeforlife": "github:ocadotechnology/codeforlife-package-javascript#v1.25.15",
     "country-list": "^2.3.0",
     "crypto-js": "^4.1.1",
     "formik": "^2.2.9",
@@ -71,4 +71,4 @@
   "nyc": {
     "exclude": []
   }
-}
+}
diff --git a/frontend/src/pages/login/BaseForm.tsx b/frontend/src/pages/login/BaseForm.tsx
@@ -32,7 +32,7 @@ const BaseForm = <Values extends FormikValues = FormikValues>({
         <Typography align='center' variant='h4'>
           {header}
         </Typography>
-        <Typography align='center' variant='h5'>
+        <Typography align='center' variant='h6'>
           {subheader}
         </Typography>
         <Form {...formProps} />

diff --git a/frontend/src/pages/login/Login.tsx b/frontend/src/pages/login/Login.tsx
@@ -33,6 +33,7 @@ const Login: React.FC<{
         .default(false)
     })
   );
+
   return (
     <Page.Container>
       {searchParams?.verifyEmail === true &&

diff --git a/frontend/yarn.lock b/frontend/yarn.lock
@@ -4098,9 +4098,9 @@ coa@^2.0.2:
     chalk "^2.4.1"
     q "^1.1.2"
 
-"codeforlife@github:ocadotechnology/codeforlife-package-javascript#v1.25.5":
-  version "1.25.5"
-  resolved "https://codeload.github.com/ocadotechnology/codeforlife-package-javascript/tar.gz/fddcd6eadc590386bd30f9ccad75cc5ca7ff1619"
+"codeforlife@github:ocadotechnology/codeforlife-package-javascript#v1.25.15":
+  version "1.25.15"
+  resolved "https://codeload.github.com/ocadotechnology/codeforlife-package-javascript/tar.gz/a16a79b4531c9603993fd9c678bafc275a4a9178"
   dependencies:
     "@emotion/react" "^11.10.6"
     "@emotion/styled" "^11.10.6"