From b403be51a8ef39fc0c26b0a7991b5cd7171a991c Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Tue, 5 Apr 2022 16:30:12 -0700 Subject: [PATCH] Padding at bottom, rounded corners when editing top/bottom labels --- packages/web/pages/settings/emails.tsx | 1 + packages/web/pages/settings/labels.tsx | 21 ++++++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/packages/web/pages/settings/emails.tsx b/packages/web/pages/settings/emails.tsx index 0d585aaeb..b0a3fa1b3 100644 --- a/packages/web/pages/settings/emails.tsx +++ b/packages/web/pages/settings/emails.tsx @@ -417,6 +417,7 @@ export default function EmailsPage(): JSX.Element { ) })} + ) } diff --git a/packages/web/pages/settings/labels.tsx b/packages/web/pages/settings/labels.tsx index d94441e6f..f27c9c62a 100644 --- a/packages/web/pages/settings/labels.tsx +++ b/packages/web/pages/settings/labels.tsx @@ -354,6 +354,8 @@ export default function LabelsPage(): JSX.Element { labelColorHex={labelColorHex} editingLabelId={editingLabelId} isCreateMode={isCreateMode} + isLastChild={isLastChild} + isFirstChild={isFirstChild} handleGenerateRandomColor={handleGenerateRandomColor} setEditingLabelId={setEditingLabelId} setLabelColorHex={setLabelColorHex} @@ -395,6 +397,7 @@ export default function LabelsPage(): JSX.Element { ) }) : null} + ) } @@ -486,7 +489,7 @@ function GenericTableCard(props: GenericTableCardProps & { isLastChild?: boolean } return ( - {(showInput && !label) ? null : ( - + )} @@ -730,7 +733,9 @@ function MobileEditCard(props: any) { setDescriptionInputText, createLabel, resetState, - updateLabel + updateLabel, + isFirstChild, + isLastChild, } = props const handleEdit = () => { @@ -739,10 +744,16 @@ function MobileEditCard(props: any) { } return ( - + {nameInputText && ( - + )}