brandxtech/frontend
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed column misplacement when no render for gutter

Browse source
This commit is contained in:
Carter 2024-11-25 20:56:52 -06:00
parent f2d3b32c97
commit e4189a23c5
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/common/ResponsiveTable.tsx
View file

@ -22,7 +22,7 @@ const useStyles = makeStyles((theme: Theme) => {
padding: theme.spacing(1) padding: theme.spacing(1)
}, },
titleContainer: { titleContainer: {
border: "none" border: "none",
}, },
searchContainer: { searchContainer: {
border: "none", border: "none",
@ -108,7 +108,7 @@ export default function ResponsiveTable<T extends Object>(props: Props<T>) {
<Table> <Table>
<TableHead> <TableHead>
<TableRow> <TableRow>
{title && <TableCell colSpan={3} className={classes.titleContainer}> {title && <TableCell colSpan={2} className={classes.titleContainer}>
{typeof(title) === "string" ? {typeof(title) === "string" ?
<Typography variant="h5" className={classes.title}> <Typography variant="h5" className={classes.title}>
{title} {title}
@ -120,7 +120,7 @@ export default function ResponsiveTable<T extends Object>(props: Props<T>) {
} }
</TableCell>} </TableCell>}
{ setSearchText && { setSearchText &&
<TableCell colSpan={title ? 3 : 6} className={classes.searchContainer}> <TableCell colSpan={title ? 2 : 4} className={classes.searchContainer}>
<TextField <TextField
variant="standard" variant="standard"
className={classes.title} className={classes.title}

1
src/pages/Users.tsx
View file

@ -355,7 +355,6 @@ export default function Users() {
<SearchSelect <SearchSelect
label="Select an action to allow" label="Select an action to allow"
selected={selectedAction} selected={selectedAction}
// options={actions}
options={actions options={actions
.filter(a => !selectedUser.settings.actions.includes(a)) .filter(a => !selectedUser.settings.actions.includes(a))
.map(a => { .map(a => {