diff --git a/jams-react-client/src/assets/jss/material-dashboard-react/components/buttonStyle.js b/jams-react-client/src/assets/jss/material-dashboard-react/components/buttonStyle.js index 634bcc35c4fb9b0fcdaa19e0c49548d5c9aee12d..2737b6367a29f4c7b41864f84709a33ca219a8d5 100644 --- a/jams-react-client/src/assets/jss/material-dashboard-react/components/buttonStyle.js +++ b/jams-react-client/src/assets/jss/material-dashboard-react/components/buttonStyle.js @@ -44,7 +44,7 @@ const buttonStyle = { touchAction: "manipulation", cursor: "pointer", "&:hover,&:focus": { - color: blackColor, + color: "inherit", backgroundColor: grayColor[0], boxShadow: "0 14px 26px -12px rgba(" + diff --git a/jams-react-client/src/components/Navbars/Navbar.js b/jams-react-client/src/components/Navbars/Navbar.js index 7e66562c93b933a9cbc5eee9480afb85517ea7a2..f9689a9e6d214e89fbffdd6313d13bc2f66e7243 100755 --- a/jams-react-client/src/components/Navbars/Navbar.js +++ b/jams-react-client/src/components/Navbars/Navbar.js @@ -34,7 +34,7 @@ export default function Header(props) { </div> <Hidden mdUp implementation="css"> <IconButton - color="info" + color="default" aria-label="open drawer" onClick={props.handleDrawerToggle} > diff --git a/jams-react-client/src/views/Blueprints/Blueprints.js b/jams-react-client/src/views/Blueprints/Blueprints.js index b2b2834b9527374947d91165721b390db98d98d7..4cbc643b82f76fdd51a9a3beb360c335a3e84132 100644 --- a/jams-react-client/src/views/Blueprints/Blueprints.js +++ b/jams-react-client/src/views/Blueprints/Blueprints.js @@ -103,8 +103,8 @@ export default function Blueprints() { const [disableCreate, setDisableCreate] = React.useState(true); - const [removedBlueprint, setRemovedBlueprint] = React.useState(); - const [openRemoveDialog, setOpenRemoveDialog] = React.useState(); + const [removedBlueprint, setRemovedBlueprint] = React.useState(""); + const [openRemoveDialog, setOpenRemoveDialog] = React.useState(false); useEffect(() => { setLoading(true); @@ -254,7 +254,7 @@ export default function Blueprints() { <DialogContentText id="alert-dialog-description"> <FormControl className={classes.margin} - size="large" + size="medium" error={blueprintNameExits} > <InputLabel htmlFor="blueprintName"> @@ -295,14 +295,14 @@ export default function Blueprints() { <DialogActions> <Button onClick={handleClose} - color="info" - className={classes.whiteButtonText} + color="primary" > {i18next.t("cancel", "Cancel")} </Button> <Button onClick={handleCreateBlueprint} - color="primary" + color="info" + className={classes.whiteButtonText} disabled={disableCreate} autoFocus > diff --git a/jams-react-client/src/views/Groups/Groups.js b/jams-react-client/src/views/Groups/Groups.js index 472fd01c69576fcc44985b855536f2696a2c4876..3c7fc79f63d3b5fb9dbd233f4a78f8f0ba8a664e 100644 --- a/jams-react-client/src/views/Groups/Groups.js +++ b/jams-react-client/src/views/Groups/Groups.js @@ -399,14 +399,14 @@ export default function Groups() { <DialogActions> <Button onClick={handleCloseCreate} - color="info" - className={classes.whiteButtonText} + color="primary" > Cancel </Button> <Button onClick={handleCreateGroup} - color="primary" + color="info" + className={classes.whiteButtonText} disabled={disableCreate} autoFocus > diff --git a/jams-react-client/src/views/Settings/General.js b/jams-react-client/src/views/Settings/General.js index 4e4bfcfcb3928d5d33610d6b8e9ceeedc46ce178..4239499d63f7023187815bcd984c5a98aa7299e1 100644 --- a/jams-react-client/src/views/Settings/General.js +++ b/jams-react-client/src/views/Settings/General.js @@ -108,7 +108,7 @@ export default function General(props) { password: Yup.string().required( i18next.t("password_is_required", "Password is required!") ), - passwordConfirmation: Yup.string().oneOf( + confirmPassword: Yup.string().oneOf( [Yup.ref("password"), null], i18next.t("password_must_match", "Passwords must match") ),