diff --git a/src/SIGNUP_SRC/components/Form/TextToggle/Label.tsx b/src/SIGNUP_SRC/components/Form/TextToggle/Label.tsx index b27a87c7..20e8add9 100644 --- a/src/SIGNUP_SRC/components/Form/TextToggle/Label.tsx +++ b/src/SIGNUP_SRC/components/Form/TextToggle/Label.tsx @@ -18,9 +18,7 @@ export function Label({ text, ...props }: LabelProps) { props.className )} style={{ - color: isLightMode - ? "#7c7c7c" // gray-03 - : "#CECECE", // gray-01 + color: "var(--fore-subtle)", }} > {text} diff --git a/src/SIGNUP_SRC/components/Input/InputCheckbox.tsx b/src/SIGNUP_SRC/components/Input/InputCheckbox.tsx index 553803ca..338cd81d 100644 --- a/src/SIGNUP_SRC/components/Input/InputCheckbox.tsx +++ b/src/SIGNUP_SRC/components/Input/InputCheckbox.tsx @@ -39,12 +39,11 @@ export const InputCheckbox = React.forwardRef - + @@ -52,7 +51,7 @@ export const InputCheckbox = React.forwardRef {label} diff --git a/src/SIGNUP_SRC/components/Input/InputErrorMessage.tsx b/src/SIGNUP_SRC/components/Input/InputErrorMessage.tsx index 0096c1cd..6c36af6b 100644 --- a/src/SIGNUP_SRC/components/Input/InputErrorMessage.tsx +++ b/src/SIGNUP_SRC/components/Input/InputErrorMessage.tsx @@ -28,7 +28,7 @@ export function InputErrorMessage({ className={twMerge( "mt-2 relative text-sm border border-primary-01 text-primary-02 font-medium p-2 rounded-lg", rest.className, - "dark:bg-primary-01 dark:border-none font-normal" + "dark:bg-error dark:border-none font-normal" )} style={{ color: "#E43D3D", // primary-02 diff --git a/src/SIGNUP_SRC/components/Input/InputLabel.tsx b/src/SIGNUP_SRC/components/Input/InputLabel.tsx index 6010c189..f76c4471 100644 --- a/src/SIGNUP_SRC/components/Input/InputLabel.tsx +++ b/src/SIGNUP_SRC/components/Input/InputLabel.tsx @@ -14,9 +14,10 @@ export function InputLabel({ required, disabled, label, ...rest }: InputLabelPro data-disabled={disabled} data-required={required} className={twMerge( - "relative mb-1 text-sm text-gray-03 data-[disabled=true]:text-gray-02 data-[disabled=true]:cursor-not-allowed w-fit data-[required=true]:after:text-primary-03 data-[required=true]:after:content-['*'] data-[required=true]:after:font-bold data-[required=true]:after:absolute data-[required=true]:after:-right-2.5", + "relative mb-1 text-sm text-gray-03 data-[disabled=true]:cursor-not-allowed w-fit data-[required=true]:after:text-primary-03 data-[required=true]:after:content-['*'] data-[required=true]:after:font-bold data-[required=true]:after:absolute data-[required=true]:after:-right-2.5", rest.className )} + style={{ color: "var(--fore-accent)" }} > {label} diff --git a/src/SIGNUP_SRC/components/Input/InputSkeleton.tsx b/src/SIGNUP_SRC/components/Input/InputSkeleton.tsx index 714bffe3..ce5bf8d4 100644 --- a/src/SIGNUP_SRC/components/Input/InputSkeleton.tsx +++ b/src/SIGNUP_SRC/components/Input/InputSkeleton.tsx @@ -21,7 +21,7 @@ export function InputSkeleton({ children, animation, ...rest }: InputSkeletonPro

{children ?? "Carregando..."} diff --git a/src/SIGNUP_SRC/components/Input/InputStringAction.tsx b/src/SIGNUP_SRC/components/Input/InputStringAction.tsx index 8f4f235d..502c337f 100644 --- a/src/SIGNUP_SRC/components/Input/InputStringAction.tsx +++ b/src/SIGNUP_SRC/components/Input/InputStringAction.tsx @@ -58,15 +58,15 @@ export const InputStringAction = React.forwardRef< type={type} id={inputId} className={twMerge( - "placeholder:text-gray-03 outline-none grow min-w-0 text-secondary-03 bg-transparent", + "placeholder:text-fore-subtle outline-none grow min-w-0 text-fore-ground-base bg-transparent", rest.className )} ref={asChild ? null : ref} > {children} -

- +
+
diff --git a/src/SIGNUP_SRC/components/SelectControlled/Select.tsx b/src/SIGNUP_SRC/components/SelectControlled/Select.tsx index 1758530e..39346174 100644 --- a/src/SIGNUP_SRC/components/SelectControlled/Select.tsx +++ b/src/SIGNUP_SRC/components/SelectControlled/Select.tsx @@ -46,9 +46,6 @@ export const Select = React.forwardRef(function SelectC const showingOptions = options?.filter((opt) => !value.includes(opt)) ?? null; const hasSelectedAll = showingOptions?.length === 0; - const { theme } = useTheme(); - const isLightMode = theme === "light"; - const handleClickSelect = () => { if (!hasSelectedAll) setIsShowingOptionsModal((isOpen) => !isOpen); }; @@ -76,11 +73,7 @@ export const Select = React.forwardRef(function SelectC } return ( -
+
(function SelectC value.map((selectedOption) => ( {selectedOption} - + )) ) : ( Selecione uma especialização )} - + {isShowingOptionsModal ? ( - +
Carregando... @@ -28,7 +28,7 @@ export default function SelectModalContent(props: SelectModalContentProps) { return ( {props.textAllOptionsSelected ?? "Todas opções foram selecionadas."} @@ -42,8 +42,7 @@ export default function SelectModalContent(props: SelectModalContentProps) { key={option} onClick={props.handleChooseOption(option)} className={twMerge( - "py-2 px-4 hover:bg-gray-01 rounded-lg", - "dark:hover:bg-gray-03" + "py-2 px-4 hover:bg-back-shadow rounded-lg text-fore-ground-base" )} > {option} diff --git a/src/SIGNUP_SRC/components/sign/ButtonSecondary.tsx b/src/SIGNUP_SRC/components/sign/ButtonSecondary.tsx index 047ac9af..b651967e 100644 --- a/src/SIGNUP_SRC/components/sign/ButtonSecondary.tsx +++ b/src/SIGNUP_SRC/components/sign/ButtonSecondary.tsx @@ -12,7 +12,8 @@ export function ButtonSecondary(props: ButtonSecondaryProps) { >(props: IFormSelect< // falsy ativa o placeholder, string vazia não é falsy const value = hasValidValue ? selectValue : null; - if (props.isLoading) { - return ; - } - return (