Merge pull request #1161 from bluewave-labs/hotFix/themeDisabled

Hot fix/theme disabled
bluewave-labs · Nov 15, 2024 · 325b559 · 325b559
2 parents 0b7c536 + d849a84
commit 325b559
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/Client/src/Components/Inputs/Checkbox/index.jsx b/Client/src/Components/Inputs/Checkbox/index.jsx
@@ -37,6 +37,7 @@ const Checkbox = ({
 	onChange,
 	isDisabled,
 }) => {
+	/* TODO move sizes to theme */
 	const sizes = { small: "14px", medium: "16px", large: "18px" };
 	const theme = useTheme();
 
@@ -78,6 +79,10 @@ const Checkbox = ({
 					fontSize: 13,
 					color: theme.palette.text.tertiary,
 				},
+				".MuiFormControlLabel-label.Mui-disabled": {
+					color: theme.palette.text.tertiary,
+					opacity: 0.25,
+				},
 			}}
 		/>
 	);

diff --git a/Client/src/Components/Inputs/Field/index.jsx b/Client/src/Components/Inputs/Field/index.jsx
@@ -67,7 +67,7 @@ const Field = forwardRef(
 							borderColor: theme.palette.border.dark,
 						},
 					"&:has(.input-error) .MuiOutlinedInput-root fieldset": {
-						borderColor: theme.palette.error.contrastText,
+						borderColor: theme.palette.error.main,
 					},
 					display: hidden ? "none" : "",
 				}}
@@ -83,7 +83,7 @@ const Field = forwardRef(
 							<Typography
 								component="span"
 								ml={theme.spacing(1)}
-								color={theme.palette.error.contrastText}
+								color={theme.palette.error.main}
 							>
 								*
 							</Typography>
@@ -189,7 +189,7 @@ const Field = forwardRef(
 					<Typography
 						component="span"
 						className="input-error"
-						color={theme.palette.error.contrastText}
+						color={theme.palette.error.main}
 						mt={theme.spacing(2)}
 						sx={{
 							opacity: 0.8,