diff --git a/Client/src/Components/Avatar/index.jsx b/Client/src/Components/Avatar/index.jsx index 975f27a32..e1263d3ad 100644 --- a/Client/src/Components/Avatar/index.jsx +++ b/Client/src/Components/Avatar/index.jsx @@ -64,10 +64,10 @@ const Avatar = ({ src, small, sx }) => { "&::before": { content: `""`, position: "absolute", - top: "0", - left: "0", - width: `calc(100% - ${border * 2}px)`, - height: `calc(100% - ${border * 2}px)`, + top: 0, + left: 0, + width: `100%`, + height: `100%`, border: `${border}px solid rgba(255,255,255,0.2)`, borderRadius: "50%", }, diff --git a/Client/src/Components/ProgressBars/index.jsx b/Client/src/Components/ProgressBars/index.jsx index 51d70bb2c..d1dcc6cfe 100644 --- a/Client/src/Components/ProgressBars/index.jsx +++ b/Client/src/Components/ProgressBars/index.jsx @@ -44,7 +44,7 @@ const ProgressUpload = ({ borderRadius: theme.shape.borderRadius, border: 1, borderColor: theme.palette.border.light, - backgroundColor: "#fafafa", + backgroundColor: theme.palette.background.fill, "&:has(.input-error)": { borderColor: theme.palette.error.main, backgroundColor: theme.palette.error.bg, @@ -62,23 +62,35 @@ const ProgressUpload = ({ direction="row" mb={error ? 0 : theme.spacing(5)} gap={theme.spacing(5)} - alignItems={error ? "center" : "flex-end"} + alignItems={error ? "center" : "flex-start"} > {error ? ( ) : icon ? ( - {icon} - + ) : ( "" )} diff --git a/Client/src/Components/TabPanels/Account/ProfilePanel.jsx b/Client/src/Components/TabPanels/Account/ProfilePanel.jsx index 885c795b1..fb782da92 100644 --- a/Client/src/Components/TabPanels/Account/ProfilePanel.jsx +++ b/Client/src/Components/TabPanels/Account/ProfilePanel.jsx @@ -414,12 +414,12 @@ const ProfilePanel = () => { top: "50%", left: "50%", transform: "translate(-50%, -50%)", - width: 450, + width: 475, bgcolor: theme.palette.background.main, border: 1, borderColor: theme.palette.border.light, borderRadius: theme.shape.borderRadius, - boxShadow: 24, + boxShadow: theme.shape.boxShadow, p: theme.spacing(15), "&:focus": { outline: "none", diff --git a/Client/src/Components/TabPanels/Account/TeamPanel.jsx b/Client/src/Components/TabPanels/Account/TeamPanel.jsx index 9809ac710..540f2b5fa 100644 --- a/Client/src/Components/TabPanels/Account/TeamPanel.jsx +++ b/Client/src/Components/TabPanels/Account/TeamPanel.jsx @@ -1,6 +1,13 @@ import { useTheme } from "@emotion/react"; import TabPanel from "@mui/lab/TabPanel"; -import { Button, ButtonGroup, Modal, Stack, Typography } from "@mui/material"; +import { + Box, + Button, + ButtonGroup, + Modal, + Stack, + Typography, +} from "@mui/material"; import { useEffect, useState } from "react"; import Field from "../../Inputs/Field"; import { credentials } from "../../../Validation/validation"; @@ -88,7 +95,7 @@ const TeamPanel = () => { id: idx, data: ( - + {member.firstName + " " + member.lastName} @@ -322,7 +329,6 @@ const TeamPanel = () => { aria-describedby="invite-member-to-team" open={isOpen} onClose={closeInviteModal} - disablePortal > { top: "50%", left: "50%", transform: "translate(-50%, -50%)", - width: 400, + width: 450, bgcolor: theme.palette.background.main, border: 1, borderColor: theme.palette.border.light, borderRadius: theme.shape.borderRadius, - boxShadow: 24, + boxShadow: theme.shape.boxShadow, p: theme.spacing(15), "&:focus": { outline: "none", }, }} > - - Invite new team member - - - When you add a new team member, they will get access to all - monitors. - + + + Invite new team member + + + When you add a new team member, they will get access to all + monitors. + +