From c98de9c14b35f72a1dad6aa1d47310eacd6a0b67 Mon Sep 17 00:00:00 2001 From: SharglutDev Date: Thu, 2 Jan 2025 16:09:05 +0100 Subject: [PATCH 1/2] ui-core: fix combobox hovered item background Signed-off-by: SharglutDev --- ui-core/src/styles/inputs/comboBox.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui-core/src/styles/inputs/comboBox.css b/ui-core/src/styles/inputs/comboBox.css index 3aaa1ebf..a1b9a495 100644 --- a/ui-core/src/styles/inputs/comboBox.css +++ b/ui-core/src/styles/inputs/comboBox.css @@ -39,7 +39,7 @@ } &:hover { - @apply bg-selection-20; + @apply bg-primary-5; } } } From b0ca9b1d16c48de153094855830c5195c478d9f7 Mon Sep 17 00:00:00 2001 From: SharglutDev Date: Thu, 2 Jan 2025 16:18:04 +0100 Subject: [PATCH 2/2] ui-core: change combobox clear icon Signed-off-by: SharglutDev --- ui-core/src/components/inputs/ComboBox/ComboBox.tsx | 4 ++-- ui-core/src/styles/inputs/input.css | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ui-core/src/components/inputs/ComboBox/ComboBox.tsx b/ui-core/src/components/inputs/ComboBox/ComboBox.tsx index a616d7b9..8b103709 100644 --- a/ui-core/src/components/inputs/ComboBox/ComboBox.tsx +++ b/ui-core/src/components/inputs/ComboBox/ComboBox.tsx @@ -9,7 +9,7 @@ import React, { useState, } from 'react'; -import { ChevronDown, X } from '@osrd-project/ui-icons'; +import { ChevronDown, XCircle } from '@osrd-project/ui-icons'; import cx from 'classnames'; import { normalizeString } from './utils'; @@ -88,7 +88,7 @@ const ComboBox = ({ ...(selectedOption || suggestions.some((suggestion) => getSuggestionLabel(suggestion) === value) ? [ { - icon: , + icon: , action: clearInput, className: 'clear-icon', }, diff --git a/ui-core/src/styles/inputs/input.css b/ui-core/src/styles/inputs/input.css index bee8ec3a..510a7efa 100644 --- a/ui-core/src/styles/inputs/input.css +++ b/ui-core/src/styles/inputs/input.css @@ -43,7 +43,7 @@ } .clear-icon { - @apply text-primary-20; + @apply text-grey-50; cursor: pointer; }