maronato/cal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: added bottom padding to Dialog component (#10629) 

Co-authored-by: Udit Takkar <udit.07814802719@cse.mait.ac.in>
Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com>
This commit is contained in:
Zain Gulbaz 2023-08-07 19:00:31 +05:00 committed by GitHub
parent 4d9047974e
commit df674532a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/web/components/ui/UsernameAvailability/PremiumTextfield.tsx
View File

@ -14,7 +14,7 @@ import type { TRPCClientErrorLike } from "@calcom/trpc/client";
import type { RouterOutputs } from "@calcom/trpc/react";
import { trpc } from "@calcom/trpc/react";
import type { AppRouter } from "@calcom/trpc/server/routers/_app";
import { Button, Dialog, DialogClose, DialogContent, Input, Label } from "@calcom/ui";
import { Button, Dialog, DialogClose, DialogContent, DialogFooter, Input, Label } from "@calcom/ui";
import { Check, Edit2, ExternalLink, Star as StarSolid } from "@calcom/ui/components/icon";
export enum UsernameChangeStatusEnum {
@ -290,7 +290,7 @@ const PremiumTextfield = (props: ICustomUsernameProps) => {
</div>
</div>
<div className="mt-4 flex flex-row-reverse gap-x-2">
<DialogFooter className="mt-4">
{/* redirect to checkout */}
{usernameChangeCondition === UsernameChangeStatusEnum.UPGRADE && (
<Button
@ -318,7 +318,7 @@ const PremiumTextfield = (props: ICustomUsernameProps) => {
<DialogClose color="secondary" onClick={() => setOpenDialogSaveUsername(false)}>
{t("cancel")}
</DialogClose>
</div>
</DialogFooter>
</DialogContent>
</Dialog>
</div>

7
apps/web/components/ui/UsernameAvailability/UsernameTextfield.tsx
View File

@ -9,7 +9,7 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { TRPCClientErrorLike } from "@calcom/trpc/client";
import { trpc } from "@calcom/trpc/react";
import type { AppRouter } from "@calcom/trpc/server/routers/_app";
import { Button, Dialog, DialogClose, DialogContent, TextField } from "@calcom/ui";
import { Button, Dialog, DialogClose, DialogContent, TextField, DialogFooter } from "@calcom/ui";
import { Check, Edit2 } from "@calcom/ui/components/icon";
interface ICustomUsernameProps {
@ -176,7 +176,8 @@ const UsernameTextfield = (props: ICustomUsernameProps & Partial<React.Component
</div>
</div>
</div>
<div className="ml-4 mt-4 flex flex-row-reverse gap-x-2">
<DialogFooter className="mt-4">
<Button
type="button"
loading={updateUsernameMutation.isLoading}
@ -188,7 +189,7 @@ const UsernameTextfield = (props: ICustomUsernameProps & Partial<React.Component
<DialogClose color="secondary" onClick={() => setOpenDialogSaveUsername(false)}>
{t("cancel")}
</DialogClose>
</div>
</DialogFooter>
</DialogContent>
</Dialog>
</div>

4
packages/ui/components/dialog/Dialog.tsx
View File

@ -119,9 +119,7 @@ export const DialogContent = React.forwardRef<HTMLDivElement, DialogContentProps
)}
<div className="w-full">
<DialogHeader title={title} subtitle={props.description} />
<div data-testid="dialog-confirmation" className="flex space-y-6">
{children}
</div>
<div data-testid="dialog-confirmation">{children}</div>
</div>
</div>
)}