fix conflict

2023-11-28 17:53:50 -08:00 · 2023-11-28 17:53:50 -08:00 · 14dbca8c07
commit 14dbca8c07
parent 7a3b36621b
1 changed files with 5 additions and 1 deletions
--- a/frontend/src/components/ui/select.tsx
+++ b/frontend/src/components/ui/select.tsx
@ -88,6 +88,10 @@ const SelectContent = React.forwardRef<
    >
      <SelectScrollUpButton />
      <SelectPrimitive.Viewport
+        className={cn(
+          "p-1",
+          position === "popper" &&
+            "h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)]"
        )}
      >
        {children}
@ -155,4 +159,4 @@ export {
  SelectSeparator,
  SelectScrollUpButton,
  SelectScrollDownButton,
-}
+}