Merge pull request #1219 from bluewave-labs/fix/fe/login-loading

fix: FE loading button on login page, resolves #1122
This commit is contained in:
Alexander Holliday authored and GitHub committed 2024-12-01 18:59:54 -08:00
commit 2788dc40be
2 files changed
+13 -3

No files matched your search

+8 -1
View File
@@ -70,7 +70,13 @@ const baseTheme = (palette) => ({
},
},
{
props: (props) => props.variant === "contained" && props.disabled,
props: (props) => {
return (
props.variant === "contained" &&
props.disabled &&
props.classes.loadingIndicator === undefined // Do not apply to loading button
);
},
style: {
backgroundColor: `${theme.palette.secondary.main} !important`,
color: `${theme.palette.secondary.contrastText} !important`,
@@ -90,6 +96,7 @@ const baseTheme = (palette) => ({
}),
},
},
MuiIconButton: {
styleOverrides: {
root: ({ theme }) => ({