diff --git a/Client/src/Pages/Auth/CheckEmail.jsx b/Client/src/Pages/Auth/CheckEmail.jsx
index 88bc1983c..d28a5b48f 100644
--- a/Client/src/Pages/Auth/CheckEmail.jsx
+++ b/Client/src/Pages/Auth/CheckEmail.jsx
@@ -5,7 +5,8 @@ import { useDispatch } from "react-redux";
import { useNavigate } from "react-router";
import { createToast } from "../../Utils/toastUtils";
import { forgotPassword } from "../../Features/Auth/authSlice";
-import background from "../../assets/Images/background_pattern_decorative.png";
+import { IconBox } from "./styled";
+import Background from "../../assets/Images/background-grid.svg?react";
import EmailIcon from "../../assets/icons/email.svg?react";
import Logo from "../../assets/icons/bwu-icon.svg?react";
import "./index.css";
@@ -93,16 +94,20 @@ const CheckEmail = () => {
fontWeight: 600,
fontSize: 22,
},
- "& p": {
- fontSize: 14,
- color: theme.palette.text.accent,
- },
+ "& p": { color: theme.palette.text.accent, fontSize: 13.5 },
+ "& span": { fontSize: "inherit" },
}}
>
+ sx={{
+ "& svg g g:last-of-type path": {
+ stroke: theme.palette.border.light,
+ },
+ }}
+ >
+
+
{
}}
>
-
+
+
+
Check your email
-
+
We sent a password reset link to{" "}
{email || "username@email.com"}
@@ -159,7 +166,7 @@ const CheckEmail = () => {
>
Open email app
-
+
Didn't receive the email?{" "}
{
textAlign="center"
sx={{
position: "absolute",
- top: "103%",
+ top: "104%",
left: "50%",
- transform: "translateX(-50%)"
+ transform: "translateX(-50%)",
}}
>
{
"& h1": {
color: theme.palette.primary.main,
fontWeight: 600,
- fontSize: 30,
- },
- "& p": {
- fontSize: 14,
- color: theme.palette.text.accent,
+ fontSize: 28,
},
+ "& p": { fontSize: 14, color: theme.palette.text.accent },
+ "& span": { fontSize: "inherit" },
}}
>
+ sx={{
+ "& svg g g:last-of-type path": {
+ stroke: theme.palette.border.light,
+ },
+ }}
+ >
+
+
{
"& h1": {
color: theme.palette.primary.main,
fontWeight: 600,
- fontSize: 22,
- },
- "& p": {
- fontSize: 14,
- color: theme.palette.text.accent,
+ fontSize: 21,
},
+ "& p": { fontSize: 13.5, color: theme.palette.text.accent },
}}
>
+ sx={{
+ "& svg g g:last-of-type path": {
+ stroke: theme.palette.border.light,
+ },
+ }}
+ >
+
+
{
textAlign="center"
>
-
+
+
+
Password reset
-
+
Your password has been successfully reset. Click below to log in
magically.
diff --git a/Client/src/Pages/Auth/Register/Register.jsx b/Client/src/Pages/Auth/Register/Register.jsx
index e454b355f..7f5ed6390 100644
--- a/Client/src/Pages/Auth/Register/Register.jsx
+++ b/Client/src/Pages/Auth/Register/Register.jsx
@@ -8,7 +8,7 @@ import { credentials } from "../../../Validation/validation";
import { createToast } from "../../../Utils/toastUtils";
import { register } from "../../../Features/Auth/authSlice";
import { useParams } from "react-router-dom";
-import background from "../../../assets/Images/background_pattern_decorative.png";
+import Background from "../../../assets/Images/background-grid.svg?react";
import Logo from "../../../assets/icons/bwu-icon.svg?react";
import Mail from "../../../assets/icons/mail.svg?react";
import ArrowBackRoundedIcon from "@mui/icons-material/ArrowBackRounded";
@@ -658,18 +658,22 @@ const Register = ({ isSuperAdmin }) => {
"& h1": {
color: theme.palette.primary.main,
fontWeight: 600,
- fontSize: 30,
- },
- "& p": {
- fontSize: 14,
- color: theme.palette.text.accent,
+ fontSize: 28,
},
+ "& p": { fontSize: 14, color: theme.palette.text.accent },
+ "& span": { fontSize: "inherit" },
}}
>
+ sx={{
+ "& svg g g:last-of-type path": {
+ stroke: theme.palette.border.light,
+ },
+ }}
+ >
+
+
{
const navigate = useNavigate();
@@ -121,8 +122,14 @@ const SetNewPassword = () => {
>
+ sx={{
+ "& svg g g:last-of-type path": {
+ stroke: theme.palette.border.light,
+ },
+ }}
+ >
+
+
{
textAlign="center"
>
-
+
+
+
Set new password
Your new password must be different to previously used passwords.
diff --git a/Client/src/Pages/Auth/index.css b/Client/src/Pages/Auth/index.css
index 33280e8f4..ba7d0e266 100644
--- a/Client/src/Pages/Auth/index.css
+++ b/Client/src/Pages/Auth/index.css
@@ -6,9 +6,7 @@
font-size: var(--env-var-font-size-xlarge);
font-weight: 600;
}
-.auth button:not(.MuiIconButton-root),
-.auth p,
-.auth span {
+.auth button:not(.MuiIconButton-root) {
font-size: var(--env-var-font-size-medium-plus);
}
diff --git a/Client/src/Pages/Auth/styled.jsx b/Client/src/Pages/Auth/styled.jsx
index c6a23d521..a6e4a3343 100644
--- a/Client/src/Pages/Auth/styled.jsx
+++ b/Client/src/Pages/Auth/styled.jsx
@@ -11,7 +11,7 @@ export const IconBox = styled(Box)(({ theme }) => ({
borderRadius: 12,
backgroundColor: theme.palette.background.accent,
margin: "auto",
- marginBottom: 4,
+ marginBottom: 8,
"& svg": {
position: "absolute",
top: "50%",
diff --git a/Client/src/Utils/Theme/darkTheme.js b/Client/src/Utils/Theme/darkTheme.js
index d590614c3..a49a85a86 100644
--- a/Client/src/Utils/Theme/darkTheme.js
+++ b/Client/src/Utils/Theme/darkTheme.js
@@ -136,7 +136,7 @@ const darkTheme = createTheme({
padding: 4,
transition: "none",
"&:hover": {
- backgroundColor: background.fill,
+ backgroundColor: border.light,
},
},
},
diff --git a/Client/src/Utils/Theme/lightTheme.js b/Client/src/Utils/Theme/lightTheme.js
index 19e44f4f7..4fc565da3 100644
--- a/Client/src/Utils/Theme/lightTheme.js
+++ b/Client/src/Utils/Theme/lightTheme.js
@@ -76,6 +76,7 @@ const lightTheme = createTheme({
body: {
backgroundImage:
"radial-gradient(circle, #fcfcfd, #fdfcfd, #fdfdfd, #fefdfe, #fefefe, #fefefe, #fefefe, #fefefe, #fefdfe, #fdfdfd, #fdfcfd, #fcfcfd)",
+ lineHeight: "inherit",
},
},
},
diff --git a/Client/src/assets/Images/background_pattern_decorative.png b/Client/src/assets/Images/background_pattern_decorative.png
deleted file mode 100644
index 34f6ebce6..000000000
Binary files a/Client/src/assets/Images/background_pattern_decorative.png and /dev/null differ
diff --git a/Client/src/assets/icons/check-outlined.svg b/Client/src/assets/icons/check-outlined.svg
index d26657863..1e779d547 100644
--- a/Client/src/assets/icons/check-outlined.svg
+++ b/Client/src/assets/icons/check-outlined.svg
@@ -1,3 +1,3 @@
diff --git a/Client/src/assets/icons/confirm-icon.svg b/Client/src/assets/icons/confirm-icon.svg
deleted file mode 100644
index d5cdd42de..000000000
--- a/Client/src/assets/icons/confirm-icon.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-
diff --git a/Client/src/assets/icons/email.svg b/Client/src/assets/icons/email.svg
index f501bd75c..01f55e961 100644
--- a/Client/src/assets/icons/email.svg
+++ b/Client/src/assets/icons/email.svg
@@ -1,18 +1,3 @@
-