fixed the actions on the bin settings and the bottom navigator opening up the side when buttons other than more waere clicked
This commit is contained in:
parent
9105b4be3a
commit
5d697091e0
3 changed files with 26 additions and 18 deletions
|
|
@ -125,7 +125,7 @@ export default function Header() {
|
|||
</Toolbar>
|
||||
</AppBar>
|
||||
<SideNavigator open={navOpen} onOpen={() => {setNavOpen(true)}} onClose={() => {setNavOpen(false)}} />
|
||||
{isMobile && <BottomNavigator setNavOpen={() => {setNavOpen(true)}} sideIsOpen={navOpen} />}
|
||||
{isMobile && <BottomNavigator setNavOpen={isOpen => {setNavOpen(isOpen)}} sideIsOpen={navOpen} />}
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
|
@ -2255,7 +2255,7 @@ export default function BinSettings(props: Props) {
|
|||
}
|
||||
return (
|
||||
<DialogActions>
|
||||
<Grid container justifyContent="space-between" direction="row">
|
||||
<Grid container justifyContent="space-between" direction="row" width="100%">
|
||||
<Grid size={{ xs: 5 }}>
|
||||
{mode === "add" ? (
|
||||
<Button
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ import { blue, red } from "@mui/material/colors";
|
|||
import { useNavigate } from "react-router-dom";
|
||||
import { makeStyles } from "@mui/styles";
|
||||
import { Share, RemoveCircle as RemoveUserIcon } from "@mui/icons-material";
|
||||
import CancelSubmit from "common/CancelSubmit";
|
||||
|
||||
const useStyles = makeStyles((theme: Theme) => {
|
||||
const avatarBG = theme.palette.secondary["700" as keyof PaletteColor];
|
||||
|
|
@ -547,22 +548,29 @@ export default function ObjectTeams(props: Props) {
|
|||
|
||||
const actions = () => {
|
||||
return (
|
||||
<Grid container direction="row" justifyContent="space-between">
|
||||
<Grid size={{ xs: 4 }}></Grid>
|
||||
<Grid size={{ xs: 8 }} container justifyContent="flex-end">
|
||||
{!cardMode && (
|
||||
<Button onClick={close} color="primary">
|
||||
Cancel
|
||||
</Button>
|
||||
)}
|
||||
{canManageUsers && (
|
||||
<Button onClick={submit} color="primary" disabled={objectUsersUnchanged()}>
|
||||
{cardMode ? "Update" : "Submit"}
|
||||
</Button>
|
||||
)}
|
||||
</Grid>
|
||||
</Grid>
|
||||
);
|
||||
<CancelSubmit
|
||||
onCancel={close}
|
||||
onSubmit={submit}
|
||||
submitText={cardMode ? "Update" : "Submit"}
|
||||
/>
|
||||
)
|
||||
// return (
|
||||
// <Grid container direction="row" justifyContent="space-between">
|
||||
// <Grid size={{ xs: 4 }}></Grid>
|
||||
// <Grid size={{ xs: 8 }} container justifyContent="flex-end">
|
||||
// {!cardMode && (
|
||||
// <Button onClick={close} color="primary">
|
||||
// Cancel
|
||||
// </Button>
|
||||
// )}
|
||||
// {canManageUsers && (
|
||||
// <Button onClick={submit} color="primary" disabled={objectUsersUnchanged()}>
|
||||
// {cardMode ? "Update" : "Submit"}
|
||||
// </Button>
|
||||
// )}
|
||||
// </Grid>
|
||||
// </Grid>
|
||||
// );
|
||||
};
|
||||
|
||||
const dialogs = () => {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue