fix(dashboard,ui): ConditionBlock styling (#10481)

**What**
- Resolves CMRC-58
- Also fixes some other issues, TS errors, Eslint warnings etc. in the Promotion domain. There are still several TS errors as the return types from `@medusajs/types` don't seem to match how they are used here, but I have left that as is, as I am not super familiar with the Promotion module.
This commit is contained in:
Kasper Fabricius Kristensen
2024-12-09 18:42:19 +01:00
committed by GitHub
parent 3409953c4f
commit c9a66b19af
8 changed files with 212 additions and 133 deletions

View File

@@ -9,6 +9,7 @@ import {
Separator as PrimitiveSeparator,
} from "@ariakit/react"
import {
CheckMini,
EllipseMiniSolid,
PlusMini,
TrianglesMini,
@@ -290,7 +291,7 @@ const ComboboxImpl = <T extends Value = string>(
ref={comboboxRef}
onFocus={() => setOpen(true)}
className={clx(
"txt-compact-small text-ui-fg-base placeholder:text-ui-fg-subtle transition-fg size-full cursor-pointer bg-transparent pl-2 pr-8 outline-none focus:cursor-text",
"txt-compact-small text-ui-fg-base !placeholder:text-ui-fg-muted transition-fg size-full cursor-pointer bg-transparent pl-2 pr-8 outline-none focus:cursor-text",
"hover:bg-ui-bg-field-hover",
{
"opacity-0": hideInput,
@@ -349,7 +350,7 @@ const ComboboxImpl = <T extends Value = string>(
)}
>
<PrimitiveComboboxItemCheck className="flex !size-5 items-center justify-center">
<EllipseMiniSolid />
{isArrayValue ? <CheckMini /> : <EllipseMiniSolid />}
</PrimitiveComboboxItemCheck>
<PrimitiveComboboxItemValue className="txt-compact-small">
{label}