From 3c53a2c018dd03695f987c14b74364cdc11508eb Mon Sep 17 00:00:00 2001 From: Dylan Jeffers Date: Mon, 29 Apr 2024 16:36:46 -0700 Subject: [PATCH 1/2] Revert "Fix web TextInput small variant icon left padding (#8176)" This reverts commit 6832772e0e4bbdce900f51bb773ebbe595092021. --- .../input/TextInput/TextInput.module.css | 2 +- .../src/components/input/TextInput/TextInput.tsx | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/packages/harmony/src/components/input/TextInput/TextInput.module.css b/packages/harmony/src/components/input/TextInput/TextInput.module.css index 94d2063a1fc..3fc5c5d686e 100644 --- a/packages/harmony/src/components/input/TextInput/TextInput.module.css +++ b/packages/harmony/src/components/input/TextInput/TextInput.module.css @@ -10,7 +10,7 @@ width: 100%; align-items: center; /* Dont need Y padding since the flex centering takes care of it */ - padding: 0 var(--harmony-spacing-l) 0 0; + padding: 0 var(--harmony-spacing-l); border: 1px solid var(--harmony-border-default); border-radius: var(--harmony-border-radius-s); background-color: var(--harmony-bg-surface-1); diff --git a/packages/harmony/src/components/input/TextInput/TextInput.tsx b/packages/harmony/src/components/input/TextInput/TextInput.tsx index d5fbe048bc9..ee3ef939b56 100644 --- a/packages/harmony/src/components/input/TextInput/TextInput.tsx +++ b/packages/harmony/src/components/input/TextInput/TextInput.tsx @@ -172,15 +172,13 @@ export const TextInput = forwardRef( inputRootStyle )} > - - {StartIcon ? ( - - ) : null} - + {StartIcon ? ( + + ) : null} {shouldShowLabel ? ( Date: Mon, 29 Apr 2024 16:48:38 -0700 Subject: [PATCH 2/2] Fix --- .../harmony/src/components/input/TextInput/TextInput.module.css | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/harmony/src/components/input/TextInput/TextInput.module.css b/packages/harmony/src/components/input/TextInput/TextInput.module.css index 3fc5c5d686e..b6d4b1dbf76 100644 --- a/packages/harmony/src/components/input/TextInput/TextInput.module.css +++ b/packages/harmony/src/components/input/TextInput/TextInput.module.css @@ -32,6 +32,7 @@ /* small input size */ .contentContainer.small { + padding: 0 var(--harmony-spacing-m); /* gap between icons & content */ gap: var(--harmony-spacing-s); font-size: var(--harmony-font-s);