From 2fc3336dd2a4ab7f8e7804e156467c7bf132a246 Mon Sep 17 00:00:00 2001 From: Peter Zimon Date: Tue, 6 Jun 2023 15:07:20 +0200 Subject: [PATCH] Fixed modal padding bug refs. https://github.com/TryGhost/Team/issues/3351 --- .../src/admin-x-ds/global/Modal.tsx | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/ghost/admin-x-settings/src/admin-x-ds/global/Modal.tsx b/ghost/admin-x-settings/src/admin-x-ds/global/Modal.tsx index 0cefc1a7b2..ecdbc102ac 100644 --- a/ghost/admin-x-settings/src/admin-x-ds/global/Modal.tsx +++ b/ghost/admin-x-settings/src/admin-x-ds/global/Modal.tsx @@ -75,7 +75,7 @@ const Modal: React.FC = ({ let modalClasses = clsx('relative z-50 mx-auto flex w-full flex-col justify-between rounded bg-white shadow-xl'); let backdropClasses = clsx('fixed inset-0 z-40 h-[100vh] w-[100vw] overflow-y-scroll '); - let padding; + let padding = ''; let footerContainerBottom = ''; @@ -83,52 +83,52 @@ const Modal: React.FC = ({ case 'sm': modalClasses += ' max-w-[480px] '; backdropClasses += ' p-[8vmin]'; - padding = 8; + padding = 'p-8'; footerContainerBottom = 'calc(-1 * (8vmin + 48px)'; break; case 'md': modalClasses += ' max-w-[720px] '; backdropClasses += ' p-[8vmin]'; - padding = 8; + padding = 'p-8'; footerContainerBottom = 'calc(-1 * (8vmin + 48px)'; break; case 'lg': modalClasses += ' max-w-[1020px] '; backdropClasses += ' p-[4vmin]'; - padding = 12; + padding = 'p-12'; footerContainerBottom = 'calc(-1 * (4vmin + 68px)'; break; case 'xl': modalClasses += ' max-w-[1240px] '; backdropClasses += ' p-[3vmin]'; - padding = 14; + padding = 'p-12'; footerContainerBottom = 'calc(-1 * (3vmin + 68px)'; break; case 'full': modalClasses += ' h-full '; backdropClasses += ' p-[2vmin]'; - padding = 12; + padding = 'p-12'; footerContainerBottom = 'calc(-1 * (2vmin + 68px)'; break; case 'bleed': modalClasses += ' h-full '; - padding = 12; + padding = 'p-12'; break; default: backdropClasses += ' p-[8vmin]'; footerContainerBottom = 'calc(-1 * (8vmin + 48px)'; - padding = 8; + padding = 'p-8'; break; } if (noPadding) { - padding = 0; + padding = 'p-0'; } let footerContainerClasses = clsx( @@ -139,11 +139,11 @@ const Modal: React.FC = ({ ); let footerClasses = clsx( - `px-${padding} pb-${padding} ${stickyFooter && `pt-8`} z-[101] flex items-center justify-between`, + `${padding} ${stickyFooter ? 'pt-8' : 'pt-0'} z-[101] flex items-center justify-between`, stickyFooter && `sticky bottom-[-48px] rounded-b bg-white` ); - let contentClasses = `p-${padding}`; + let contentClasses = `${padding}`; if (!customFooter) { contentClasses += ' pb-0 ';