-
+
+
+ toggleOrgModal(false)}
+ disablePortal
+ >
+
+
+ Rename this organization?
+
+
+ setOrgStates((prev) => ({
+ ...prev,
+ newName: event.target.value,
+ }))
+ }
+ >
+
+
+
+
+
- toggleOrgModal(false)}
- disablePortal
- >
-
-
- Rename this organization?
-
-
- setOrgStates((prev) => ({
- ...prev,
- newName: event.target.value,
- }))
- }
- >
-
-
-
-
{
width: 400,
bgcolor: "white",
border: "solid 1px #f2f2f2",
- borderRadius: "4px",
+ borderRadius: `${theme.shape.borderRadius}px`,
boxShadow: 24,
p: "30px",
"&:focus": {
@@ -518,15 +491,7 @@ const TeamPanel = () => {
Invite new team member
-
+
When you add a new team member, they will get access to all
monitors.
@@ -546,14 +511,12 @@ const TeamPanel = () => {
level="tertiary"
label="Cancel"
onClick={() => setToggleInviteModal(false)}
- sx={{ fontSize: "13px" }}
/>
diff --git a/Client/src/Pages/Settings/index.css b/Client/src/Pages/Settings/index.css
index 0b525bbac..c966a9031 100644
--- a/Client/src/Pages/Settings/index.css
+++ b/Client/src/Pages/Settings/index.css
@@ -1,47 +1,67 @@
-.edit-profile-form,
-.edit-password-form,
-.delete-profile-form,
-.edit-team-form {
+.settings h1.MuiTypography-root,
+.settings p.MuiTypography-root,
+.settings input,
+.settings button,
+.settings td,
+.settings .MuiSelect-select {
+ font-size: var(--env-var-font-size-medium);
+}
+.settings h1.MuiTypography-root,
+.settings p.MuiTypography-root,
+.settings input,
+.settings .MuiSelect-select {
+ color: var(--env-var-color-2);
+}
+.settings h1.MuiTypography-root {
+ font-weight: 600;
+}
+.settings .MuiStack-root:not(.table-stack) {
+ flex: 1;
+ -webkit-flex: 1;
+ -ms-flex: 1;
+}
+.settings .MuiTabPanel-root {
+ padding: 0;
+ margin-top: 50px;
+}
+.settings .MuiDivider-root:not(.short-divider) {
+ margin: 50px 0;
+}
+.settings .MuiDivider-root,
+.settings .MuiOutlinedInput-root fieldset,
+.announcement-tile {
+ border-color: var(--env-var-color-29);
+}
+[class$="-form"] {
width: inherit;
}
-.edit-profile-form__wrapper,
-.delete-profile-form__wrapper {
- width: 90%;
-}
-.edit-profile-form__wrapper,
-.delete-profile-form__wrapper,
-.edit-password-form__wrapper,
-.edit-team-form__wrapper {
+[class$="__wrapper"],
+[class$="__wrapper compact"] {
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: flex-start;
}
-.edit-profile-form__wrapper h1.MuiTypography-root,
-.delete-profile-form__wrapper h1.MuiTypography-root,
-.edit-password-form__wrapper h1.MuiTypography-root,
-.edit-team-form__wrapper h1.MuiTypography-root {
- font-size: var(--env-var-font-size-medium);
- color: var(--env-var-color-2);
- font-weight: 600;
+.edit-profile-form__wrapper .MuiStack-root:not(.row-stack),
+.edit-password-form__wrapper .MuiStack-root:not(.row-stack),
+.edit-organization-form__wrapper .MuiStack-root:not(.row-stack) {
+ flex-direction: column;
+ gap: 8px;
+ margin-right: 10px;
}
.edit-profile-form__wrapper p.MuiTypography-root,
.delete-profile-form__wrapper p.MuiTypography-root {
- font-size: var(--env-var-font-size-medium);
- color: var(--env-var-color-2);
opacity: 0.6;
}
#modal-delete-account,
#modal-edit-org-name,
#modal-invite-member {
font-size: var(--env-var-font-size-large);
- color: var(--env-var-color-2);
- font-weight: 600;
}
.edit-profile-form__wrapper:not(:first-of-type),
.edit-password-form__wrapper:not(:first-of-type),
.edit-team-form__wrapper:not(:first-of-type) {
- margin-top: 40px;
+ margin-top: var(--env-var-spacing-4);
}
.edit-team-form__wrapper.compact {
margin-top: 30px;
@@ -51,10 +71,8 @@
.edit-password-form__wrapper input,
#edit-organization-name,
#input-team-member {
- font-size: var(--env-var-font-size-medium);
padding: 10px;
}
-
.edit-password-form__wrapper > .announcement-tile {
width: 100%;
}
@@ -63,6 +81,10 @@
.announcement-content-subject {
margin-bottom: 2px;
}
+#edit-password + div > button > svg,
+#edit-current-password + div > button > svg {
+ color: var(--env-var-color-29);
+}
.edit-password-form__wrapper .announcement-tile {
margin: 0;
}
@@ -78,7 +100,6 @@
color: var(--env-var-color-28);
fill: var(--env-var-color-28) !important;
}
-
#org-name-flex-container .Mui-disabled {
color: var(--env-var-color-2) !important;
}
@@ -89,7 +110,7 @@
vertical-align: text-top;
}
.edit-team-form__wrapper th {
- padding: 14px 0;
+ padding: var(--env-var-spacing-1) 0;
}
.edit-team-form__wrapper th:first-of-type {
padding-left: 20px;
@@ -117,7 +138,10 @@
border-color: var(--env-var-color-2);
}
-.members-query{
+.MuiStack-root:has(.MuiBox-root > .members-query) .MuiBox-root {
+ cursor: pointer;
+}
+.members-query {
display: inline-flex;
justify-content: center;
align-items: center;
@@ -130,4 +154,4 @@
min-width: 22px;
min-height: 22px;
border-radius: 50%;
-}
\ No newline at end of file
+}
diff --git a/Client/src/Pages/Settings/index.jsx b/Client/src/Pages/Settings/index.jsx
index c49b08a38..3dd47859b 100644
--- a/Client/src/Pages/Settings/index.jsx
+++ b/Client/src/Pages/Settings/index.jsx
@@ -1,10 +1,6 @@
import PropTypes from "prop-types";
import { useState } from "react";
-import {
- Box,
- Tab,
- useTheme,
-} from "@mui/material";
+import { Box, Tab, useTheme } from "@mui/material";
import TabContext from "@mui/lab/TabContext";
import TabList from "@mui/lab/TabList";
import "./index.css";
@@ -32,18 +28,22 @@ const Settings = () => {
return (
-
+
{tabList.map((label, index) => (
{
color: theme.palette.secondary.main,
textTransform: "none",
minWidth: "fit-content",
+ minHeight: 0,
paddingLeft: "0",
- paddingY: "8px",
+ paddingY: "10px",
marginRight: "20px",
"&:focus": {
outline: "none",
},
+ "& .MuiTouchRipple-root": {
+ pointerEvents: "none",
+ display: "none",
+ },
}}
/>
))}