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

@@ -90,7 +90,7 @@ const Copy = React.forwardRef<HTMLButtonElement, CopyProps>(
aria-label="Copy code snippet"
type="button"
className={clx(
"text-ui-contrast-fg-secondary h-fit w-fit",
"h-fit w-fit",
className
)}
onClick={copyToClipboard}
@@ -100,14 +100,14 @@ const Copy = React.forwardRef<HTMLButtonElement, CopyProps>(
children
) : done ? (
isDefault ? (
<CheckCircleSolid />
<CheckCircleSolid className="text-ui-fg-subtle" />
) : (
<CheckCircleMiniSolid />
<CheckCircleMiniSolid className="text-ui-fg-subtle" />
)
) : isDefault ? (
<SquareTwoStack />
<SquareTwoStack className="text-ui-fg-subtle" />
) : (
<SquareTwoStackMini />
<SquareTwoStackMini className="text-ui-fg-subtle" />
)}
</Component>
</Tooltip>

View File

@@ -1,6 +1,6 @@
"use client"
import { EllipseMiniSolid, TrianglesMini } from "@medusajs/icons"
import { Check, TrianglesMini } from "@medusajs/icons"
import * as SelectPrimitive from "@radix-ui/react-select"
import { cva } from "cva"
import * as React from "react"
@@ -194,7 +194,7 @@ const Item = React.forwardRef<
>
<span className="flex h-[15px] w-[15px] items-center justify-center">
<SelectPrimitive.ItemIndicator className="flex items-center justify-center">
<EllipseMiniSolid />
<Check />
</SelectPrimitive.ItemIndicator>
</span>
<SelectPrimitive.ItemText className="flex-1 truncate">