Merge branch 'v3-main' into add-guild-page

guildxyz · Dec 11, 2024 · 0d6a0df · 0d6a0df
2 parents b5215ec + 23e189b
commit 0d6a0df
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/components/ui/Dialog.tsx b/src/components/ui/Dialog.tsx
@@ -116,9 +116,12 @@ const DialogBody = ({
   className,
   ...props
 }: HTMLAttributes<HTMLDivElement>) => (
-  <ScrollArea className="flex max-h-full flex-col">
+  <ScrollArea className="group dialog-scroll-area flex max-h-full flex-col">
     <div
-      className={cn("flex flex-col px-6 pb-10 sm:px-10", className)}
+      className={cn(
+        "flex flex-col px-6 pb-10 group-[.dialog-scroll-area:has(+div)]:pb-0 sm:px-10",
+        className,
+      )}
       {...props}
     />
   </ScrollArea>

diff --git a/src/components/ui/Drawer.tsx b/src/components/ui/Drawer.tsx
@@ -44,7 +44,7 @@ const DrawerContent = forwardRef<
     <DrawerPrimitive.Content
       ref={ref}
       className={cn(
-        "fixed inset-x-0 bottom-0 z-50 mt-24 flex h-auto max-h-[calc(100vh-theme(space.16))] flex-col rounded-t-xl bg-background",
+        "fixed inset-x-0 bottom-0 z-50 mx-auto mt-24 flex h-auto max-h-[calc(100vh-theme(space.16))] max-w-md flex-col rounded-t-xl bg-background",
         className,
       )}
       {...props}
@@ -87,7 +87,7 @@ const DrawerFooter = ({
   ...props
 }: HTMLAttributes<HTMLDivElement>) => (
   <div
-    className={cn("mt-auto flex flex-col gap-2 px-6 pb-6", className)}
+    className={cn("mt-auto flex flex-col gap-2 px-6 py-6", className)}
     {...props}
   />
 );