Skip to content
Snippets Groups Projects
Commit 88507506 authored by Léo Banno-Cloutier's avatar Léo Banno-Cloutier
Browse files

blueprints: swap button colors in dialog

The cancel button was blue, while the submit button was white, making it
intuitively wrong, as I saw other people naturally pressing the blue
button by accident

Change-Id: Ic14bd3abf26915f217fe9686ff80933a4a31bb87
parent c563b697
No related branches found
No related tags found
No related merge requests found
...@@ -44,7 +44,7 @@ const buttonStyle = { ...@@ -44,7 +44,7 @@ const buttonStyle = {
touchAction: "manipulation", touchAction: "manipulation",
cursor: "pointer", cursor: "pointer",
"&:hover,&:focus": { "&:hover,&:focus": {
color: blackColor, color: "inherit",
backgroundColor: grayColor[0], backgroundColor: grayColor[0],
boxShadow: boxShadow:
"0 14px 26px -12px rgba(" + "0 14px 26px -12px rgba(" +
......
...@@ -34,7 +34,7 @@ export default function Header(props) { ...@@ -34,7 +34,7 @@ export default function Header(props) {
</div> </div>
<Hidden mdUp implementation="css"> <Hidden mdUp implementation="css">
<IconButton <IconButton
color="info" color="default"
aria-label="open drawer" aria-label="open drawer"
onClick={props.handleDrawerToggle} onClick={props.handleDrawerToggle}
> >
......
...@@ -103,8 +103,8 @@ export default function Blueprints() { ...@@ -103,8 +103,8 @@ export default function Blueprints() {
const [disableCreate, setDisableCreate] = React.useState(true); const [disableCreate, setDisableCreate] = React.useState(true);
const [removedBlueprint, setRemovedBlueprint] = React.useState(); const [removedBlueprint, setRemovedBlueprint] = React.useState("");
const [openRemoveDialog, setOpenRemoveDialog] = React.useState(); const [openRemoveDialog, setOpenRemoveDialog] = React.useState(false);
useEffect(() => { useEffect(() => {
setLoading(true); setLoading(true);
...@@ -254,7 +254,7 @@ export default function Blueprints() { ...@@ -254,7 +254,7 @@ export default function Blueprints() {
<DialogContentText id="alert-dialog-description"> <DialogContentText id="alert-dialog-description">
<FormControl <FormControl
className={classes.margin} className={classes.margin}
size="large" size="medium"
error={blueprintNameExits} error={blueprintNameExits}
> >
<InputLabel htmlFor="blueprintName"> <InputLabel htmlFor="blueprintName">
...@@ -295,14 +295,14 @@ export default function Blueprints() { ...@@ -295,14 +295,14 @@ export default function Blueprints() {
<DialogActions> <DialogActions>
<Button <Button
onClick={handleClose} onClick={handleClose}
color="info" color="primary"
className={classes.whiteButtonText}
> >
{i18next.t("cancel", "Cancel")} {i18next.t("cancel", "Cancel")}
</Button> </Button>
<Button <Button
onClick={handleCreateBlueprint} onClick={handleCreateBlueprint}
color="primary" color="info"
className={classes.whiteButtonText}
disabled={disableCreate} disabled={disableCreate}
autoFocus autoFocus
> >
......
...@@ -399,14 +399,14 @@ export default function Groups() { ...@@ -399,14 +399,14 @@ export default function Groups() {
<DialogActions> <DialogActions>
<Button <Button
onClick={handleCloseCreate} onClick={handleCloseCreate}
color="info" color="primary"
className={classes.whiteButtonText}
> >
Cancel Cancel
</Button> </Button>
<Button <Button
onClick={handleCreateGroup} onClick={handleCreateGroup}
color="primary" color="info"
className={classes.whiteButtonText}
disabled={disableCreate} disabled={disableCreate}
autoFocus autoFocus
> >
......
...@@ -108,7 +108,7 @@ export default function General(props) { ...@@ -108,7 +108,7 @@ export default function General(props) {
password: Yup.string().required( password: Yup.string().required(
i18next.t("password_is_required", "Password is required!") i18next.t("password_is_required", "Password is required!")
), ),
passwordConfirmation: Yup.string().oneOf( confirmPassword: Yup.string().oneOf(
[Yup.ref("password"), null], [Yup.ref("password"), null],
i18next.t("password_must_match", "Passwords must match") i18next.t("password_must_match", "Passwords must match")
), ),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment