Merge pull request #28 from AIDAPT/fix-bug-16

Fix bug 16
NethServer · Apr 17, 2024 · 50449ec · 50449ec
2 parents d064a8d + e59f755
commit 50449ec
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/src/renderer/src/components/Nethesis/TextInput.tsx b/src/renderer/src/components/Nethesis/TextInput.tsx
@@ -94,7 +94,8 @@ export const TextInput = forwardRef<HTMLInputElement, TextInputProps>(
                 icon={Icon}
                 className={classNames(
                   size === 'large' ? theme.icon.size.large : theme.icon.size.base,
-                  iconClassName || theme.icon.gray,
+                  theme.icon.white,
+                  iconClassName,
                   onIconClick && 'cursor-pointer'
                 )}
                 onClick={() => onIconClick && onIconClick()}

diff --git a/src/renderer/src/pages/LoginPage.tsx b/src/renderer/src/pages/LoginPage.tsx
@@ -253,7 +253,6 @@ export function LoginPage() {
             trailingIcon={true}
             helper={errors.password?.message || undefined}
             error={!!errors.password?.message}
-            iconClassName="text-gray-50"
           />
           <button
             type="submit"

diff --git a/src/renderer/src/pages/NethLinkPage.tsx b/src/renderer/src/pages/NethLinkPage.tsx
@@ -307,7 +307,7 @@ export function NethLinkPage() {
             className={`flex flex-col  min-w-[400px] min-h-[380px] h-full items-center justify-between`}
           >
             <div
-              className={`flex justify-end ${navigator.userAgent.includes('Windows') ? 'flex-row' : 'flex-row-reverse'} gap-1 items-center pr-4 pl-2 pb-[18px] pt-[8px] w-full bg-gray-200  dark:bg-gray-950 rounded-lg relative bottom-[-8px] z-0`}
+              className={`flex justify-end ${navigator.userAgent.includes('Windows') ? 'flex-row' : 'flex-row-reverse'} gap-1 items-center pr-4 pl-2 pb-[18px] pt-[8px] w-full bg-gray-950  dark:bg-gray-950 rounded-lg relative bottom-[-8px] z-0`}
             >
               <FontAwesomeIcon
                 className={`text-yellow-500 hover:text-yellow-400 cursor-pointer ml-2 `}

diff --git a/src/renderer/src/theme/Theme.ts b/src/renderer/src/theme/Theme.ts
@@ -86,6 +86,7 @@ const theme = {
     icon: {
       base: 'absolute flex items-center z-[9]',
       gray: 'text-gray-400 dark:text-gray-500',
+      white: 'text-gray-900 dark:text-gray-50',
       red: 'text-red-500 dark:text-red-400',
       left: 'inset-y-0 left-0 pl-3',
       right: 'inset-y-0 right-0 pr-3',