From de71c5f33996efd9dfd976439647fe79a180bd94 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Thu, 13 Feb 2025 15:19:24 -0800 Subject: [PATCH] update theme to handle buttons --- Client/src/Utils/Theme/globalTheme.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Client/src/Utils/Theme/globalTheme.js b/Client/src/Utils/Theme/globalTheme.js index 02bf6a1c0..c521cb117 100644 --- a/Client/src/Utils/Theme/globalTheme.js +++ b/Client/src/Utils/Theme/globalTheme.js @@ -132,7 +132,7 @@ const baseTheme = (palette) => ({ backgroundColor: theme.palette.secondary.main, color: theme.palette.primary.contrastText, }, - "&.MuiLoadingButton-root": { + "&.MuiButton-root": { "&:disabled": { backgroundColor: theme.palette.secondary.main, color: theme.palette.primary.contrastText, @@ -141,12 +141,13 @@ const baseTheme = (palette) => ({ boxShadow: `0 0 0 1px ${theme.palette.accent.main}`, // CAIO_REVIEW, this should really have a solid BG color }, }, - "&.MuiLoadingButton-loading": { - "& .MuiLoadingButton-label": { + "&.MuiButton-loading": { + "&:disabled": { color: "transparent", }, - "& .MuiLoadingButton-loadingIndicator": { - color: "inherit", + + "& .MuiButton-loadingIndicator": { + color: theme.palette.primary.contrastText, }, }, }),