diff --git a/Client/src/Components/BasicTable/index.jsx b/Client/src/Components/BasicTable/index.jsx index f4d343b0a..98e30a116 100644 --- a/Client/src/Components/BasicTable/index.jsx +++ b/Client/src/Components/BasicTable/index.jsx @@ -201,7 +201,27 @@ const BasicTable = ({ data, paginated, reversed, table, emptyMessage = "No data" return ( <> - +
{data.cols.map((col) => ( diff --git a/Client/src/Components/TabPanels/Account/PasswordPanel.jsx b/Client/src/Components/TabPanels/Account/PasswordPanel.jsx index 082d69c17..3c11affa6 100644 --- a/Client/src/Components/TabPanels/Account/PasswordPanel.jsx +++ b/Client/src/Components/TabPanels/Account/PasswordPanel.jsx @@ -228,7 +228,7 @@ const PasswordPanel = () => { > { { setIsOpen(true)} > Invite a team member diff --git a/Client/src/Pages/Account/index.jsx b/Client/src/Pages/Account/index.jsx index 29b936af0..4ec785c98 100644 --- a/Client/src/Pages/Account/index.jsx +++ b/Client/src/Pages/Account/index.jsx @@ -57,10 +57,10 @@ const Account = ({ open = "profile" }) => { className="account" px={theme.spacing(20)} py={theme.spacing(12)} - border={1} - borderColor={theme.palette.primary.lowContrast} - borderRadius={theme.shape.borderRadius} backgroundColor={theme.palette.primary.main} + borderColor={theme.palette.primary.lowContrast} + border={1} + borderRadius={theme.shape.borderRadius} > { textTransform: "none", minWidth: "fit-content", minHeight: 0, - paddingLeft: 0, paddingY: theme.spacing(4), fontWeight: 400, - marginRight: theme.spacing(8), + /* marginRight: theme.spacing(8), */ borderBottom: "2px solid transparent", - "&:focus": { - borderBottom: `2px solid ${theme.palette.primary.lowContrast}`, + "&:focus, &.Mui-selected": { + /* TODO this appears and disapears. Investigate */ + color: theme.palette.primary.contrastText, + borderColor: theme.palette.primary.contrastText, + fontWeight: 700, }, - "&:hover": { - borderBottom: `2px solid ${theme.palette.primary.lowContrast}`, + borderColor: theme.palette.primary.lowContrast, }, }} />