From d82b0ad67446a2058955d74776d7c6d67f1c58da Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Thu, 8 May 2025 10:40:36 -0700 Subject: [PATCH] apply colors to theme --- client/src/Utils/Theme/globalTheme.js | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/client/src/Utils/Theme/globalTheme.js b/client/src/Utils/Theme/globalTheme.js index cd8173f83..ff9d1d876 100644 --- a/client/src/Utils/Theme/globalTheme.js +++ b/client/src/Utils/Theme/globalTheme.js @@ -1,5 +1,4 @@ import { typographyLevels } from "./constants"; - const fontFamilyPrimary = '"Inter" , sans-serif'; // const fontFamilySecondary = '"Avenir", sans-serif'; @@ -300,13 +299,15 @@ const baseTheme = (palette) => ({ }), }, }, + MuiTextField: { styleOverrides: { root: ({ theme }) => ({ "& fieldset": { - borderColor: theme.palette.primary.lowContrast, + borderColor: theme.palette.primary.contrastBorder, borderRadius: theme.shape.borderRadius, }, + "& .MuiInputBase-input": { padding: ".75em", minHeight: "var(--env-var-height-2)", @@ -356,10 +357,19 @@ const baseTheme = (palette) => ({ MuiOutlinedInput: { styleOverrides: { root: { - color: palette.primary.contrastTextTertiary, - "&.Mui-focused .MuiOutlinedInput-notchedOutline": { - borderColor: palette.primary.contrastTextTertiary, + "&.Mui-disabled .MuiOutlinedInput-notchedOutline": { + borderColor: palette.primary.contrastBorderDisabled, }, + "&.Mui-disabled:hover .MuiOutlinedInput-notchedOutline": { + borderColor: palette.primary.contrastBorderDisabled, + }, + "&:hover .MuiOutlinedInput-notchedOutline": { + borderColor: palette.primary.contrastText, // Adjust hover border color + }, + "&.Mui-focused .MuiOutlinedInput-notchedOutline": { + borderColor: palette.accent.main, // Adjust focus border color + }, + color: palette.primary.contrastTextTertiary, }, }, }, @@ -486,7 +496,7 @@ const baseTheme = (palette) => ({ root: ({ theme }) => ({ ml: "auto", "& .MuiButtonBase-root, & .MuiButtonBase-root:hover": { - borderColor: theme.palette.primary.lowContrast, + borderColor: theme.palette.primary.contrastBorder, width: "auto", whiteSpace: "nowrap", },