From b7c9fa2066fa9b2e53c0d367bc189d2be012de21 Mon Sep 17 00:00:00 2001
From: Sean Edmunds <smedmunds226@gmail.com>
Date: Mon, 7 Apr 2025 22:33:29 -0500
Subject: [PATCH] Fixed styles

---
 .../components/Applications/Applications.tsx  | 26 ++++++++++++++++---
 .../Applications/DebouncedApplication.tsx     | 18 ++++++++++---
 .../components/Shared/SettingsHeader.tsx      |  2 +-
 .../settings/components/Theming/Themes.tsx    |  3 ++-
 src/styles/Select.module.css                  |  8 +++---
 5 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/src/pages/settings/components/Applications/Applications.tsx b/src/pages/settings/components/Applications/Applications.tsx
index a958446..017a46b 100644
--- a/src/pages/settings/components/Applications/Applications.tsx
+++ b/src/pages/settings/components/Applications/Applications.tsx
@@ -19,7 +19,7 @@ import { useEffect, useState } from 'react';
 import * as fa6 from 'react-icons/fa6';
 import * as si from 'react-icons/si';
 import * as vsc from 'react-icons/vsc';
-import { textInputClasses } from 'styles';
+import { selectClasses, textInputClasses } from 'styles';
 import type { Application } from 'types';
 import AddItemModal from '../Shared/AddItemModal';
 import SettingsHeader from '../Shared/SettingsHeader';
@@ -164,13 +164,28 @@ const ApplicationSettings = () => {
 						<Group justify='center'>
 							<Select
 								label={'Icon'}
-								className={textInputClasses.settingsItem}
-								classNames={textInputClasses}
+								className={selectClasses.settingsItem}
+								classNames={{
+									input: selectClasses.menuSelectInput,
+									label: selectClasses.menuSelectLabel,
+									options: selectClasses.menuSelectOptions,
+									option: selectClasses.menuSelectOption,
+									dropdown: selectClasses.dropdown,
+								}}
+								mt={12}
 								data={Object.keys(allIcons).map((icon) => {
 									return { value: icon, label: icon };
 								})}
+								defaultValue={newApplication.icon}
 								comboboxProps={{
-									zIndex: 1000,
+									zIndex: 3000,
+									withinPortal: false,
+								}}
+								onChange={(event: any) => {
+									setNewApplication({
+										...newApplication,
+										icon: event,
+									});
 								}}
 								renderOption={(item: any) => {
 									const Icon = allIcons[item.option.value];
@@ -182,6 +197,9 @@ const ApplicationSettings = () => {
 									);
 								}}
 								searchable
+								maxDropdownHeight={175}
+								onDropdownOpen={() => setIsOpen(true)}
+								onDropdownClose={() => setIsOpen(false)}
 							/>
 							<TextInput
 								label={'Filter'}
diff --git a/src/pages/settings/components/Applications/DebouncedApplication.tsx b/src/pages/settings/components/Applications/DebouncedApplication.tsx
index 20cc29f..4608676 100644
--- a/src/pages/settings/components/Applications/DebouncedApplication.tsx
+++ b/src/pages/settings/components/Applications/DebouncedApplication.tsx
@@ -14,7 +14,7 @@ import { useDebouncedValue, useDisclosure } from '@mantine/hooks';
 import { useCommonHooks, useMutationAPI } from 'hooks';
 import { useEffect, useState } from 'react';
 import { FiTrash } from 'react-icons/fi';
-import { cardClasses, textInputClasses } from 'styles';
+import { cardClasses, selectClasses, textInputClasses } from 'styles';
 import type { Application } from 'types';
 import DeleteItemModal from '../Shared/DeleteItemModal';
 
@@ -170,17 +170,26 @@ function DebouncedApplication({
 					}}
 				/>
 			</Group>
-			<Group w={'100%'} justify='center'>
+			<Group w={'100%'} justify='space-between'>
 				<Select
+					w={'48%'}
 					label={'Icon'}
-					className={textInputClasses.settingsItem}
-					classNames={textInputClasses}
+					className={selectClasses.settingsItem}
+					classNames={{
+						input: selectClasses.menuSelectInput,
+						label: selectClasses.menuSelectLabel,
+						options: selectClasses.menuSelectOptions,
+						option: selectClasses.menuSelectOption,
+						dropdown: selectClasses.dropdown,
+					}}
+					mt={12}
 					data={Object.keys(allIcons).map((icon) => {
 						return { value: icon, label: icon };
 					})}
 					defaultValue={app.icon}
 					comboboxProps={{
 						zIndex: 3000,
+						withinPortal: false,
 					}}
 					onChange={(event: any) => {
 						setUpdate({
@@ -198,6 +207,7 @@ function DebouncedApplication({
 						);
 					}}
 					searchable
+					maxDropdownHeight={175}
 					onDropdownOpen={() => setIsOpen(true)}
 					onDropdownClose={() => setIsOpen(false)}
 				/>
diff --git a/src/pages/settings/components/Shared/SettingsHeader.tsx b/src/pages/settings/components/Shared/SettingsHeader.tsx
index c37fb10..d5d0229 100644
--- a/src/pages/settings/components/Shared/SettingsHeader.tsx
+++ b/src/pages/settings/components/Shared/SettingsHeader.tsx
@@ -32,7 +32,7 @@ function SettingsHeader({
 			mt={0}
 			justify='center'
 			pos={'absolute'}
-			style={{ backdropFilter: 'blur(10px) brightness(.75)', zIndex: 250 }}
+			style={{ backdropFilter: 'blur(10px) brightness(.75)', zIndex: 199 }}
 		>
 			<Group w={isMobile ? undefined : '100%'}>
 				<Text
diff --git a/src/pages/settings/components/Theming/Themes.tsx b/src/pages/settings/components/Theming/Themes.tsx
index eaebf68..7ca8742 100644
--- a/src/pages/settings/components/Theming/Themes.tsx
+++ b/src/pages/settings/components/Theming/Themes.tsx
@@ -122,6 +122,7 @@ function ThemesSettings() {
 					display={currentTheme === 'random' ? 'flex' : 'none'}
 					blur={5}
 					style={{
+						zIndex: 190,
 						borderRadius: '10px',
 						marginTop: '-15px',
 						marginBottom: '-10px',
@@ -155,7 +156,7 @@ function ThemesSettings() {
 							<Box
 								style={{
 									zIndex:
-										currentTheme === 'random' && cardTheme.name === theme.name ? 200 : 0,
+										currentTheme === 'random' && cardTheme.name === theme.name ? 195 : 0,
 								}}
 							>
 								<ThemeCard
diff --git a/src/styles/Select.module.css b/src/styles/Select.module.css
index 3de8ad5..d4a3116 100644
--- a/src/styles/Select.module.css
+++ b/src/styles/Select.module.css
@@ -4,8 +4,8 @@
 	font-size: 14px !important;
 }
 .menuSelectInput {
-	border-color: light-dark(var(--mantine-color-appGray-2), white) !important;
-	background-color: var(--color-background) !important;
+	border-color: var(--color-border) !important;
+	background-color: var(--color-search-background) !important;
 	color: var(--color-text-pri) !important;
 	&:focus {
 		border-color: var(--color-text-pri) !important;
@@ -37,8 +37,8 @@
 
 	/* applies styles to hovered item (with mouse or keyboard) */
 	&:hover {
-		background-color: var(--color-text-acc) !important;
-		color: var(--color-text-pri) !important;
+		background-color: var(--color-text-pri) !important;
+		color: var(--color-background) !important;
 	}
 }