Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ui-core/combobox/ui-fix #793

Merged
merged 2 commits into from
Jan 3, 2025
Merged

ui-core/combobox/ui-fix #793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c98de9c
ui-core: fix combobox hovered item background
SharglutDev Jan 2, 2025
b0ca9b1
ui-core: change combobox clear icon
SharglutDev Jan 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ui-core/src/components/inputs/ComboBox/ComboBox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
useState,
} from 'react';

import { ChevronDown, X } from '@osrd-project/ui-icons';
import { ChevronDown, XCircle } from '@osrd-project/ui-icons';

Check warning on line 12 in ui-core/src/components/inputs/ComboBox/ComboBox.tsx

View workflow job for this annotation

GitHub Actions / build 

Unable to resolve path to module '@osrd-project/ui-icons'
import cx from 'classnames';

import { normalizeString } from './utils';
Expand Down Expand Up @@ -88,7 +88,7 @@
...(selectedOption || suggestions.some((suggestion) => getSuggestionLabel(suggestion) === value)
? [
{
icon: <X size={small ? 'sm' : 'lg'} />,
icon: <XCircle variant="fill" />,
action: clearInput,
className: 'clear-icon',
},
Expand Down
2 changes: 1 addition & 1 deletion ui-core/src/styles/inputs/comboBox.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
}

&:hover {
@apply bg-selection-20;
@apply bg-primary-5;
}
}
}
2 changes: 1 addition & 1 deletion ui-core/src/styles/inputs/input.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
}

.clear-icon {
@apply text-primary-20;
@apply text-grey-50;
cursor: pointer;
}

Expand Down
Loading