From e36080bc1f0aad218625914e6fa982f5c17eed9a Mon Sep 17 00:00:00 2001 From: Prakhar Sharma Date: Wed, 2 Oct 2024 16:49:56 +0530 Subject: [PATCH 1/5] fix: button group (dropdown) --- .../src/modules/ui/input/button/components/Button.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/twenty-front/src/modules/ui/input/button/components/Button.tsx b/packages/twenty-front/src/modules/ui/input/button/components/Button.tsx index de07f830399a..1ca8df6a7115 100644 --- a/packages/twenty-front/src/modules/ui/input/button/components/Button.tsx +++ b/packages/twenty-front/src/modules/ui/input/button/components/Button.tsx @@ -341,7 +341,7 @@ const StyledButton = styled('button', { height: ${({ size }) => (size === 'small' ? '24px' : '32px')}; justify-content: ${({ justify }) => justify}; padding: ${({ theme }) => { - return `0 ${theme.spacing(2)}`; + return `0 ${theme.spacing(1.5)}`; }}; transition: background 0.1s ease; From caf797194ceac28cbd73906cdc958e7557e87ba3 Mon Sep 17 00:00:00 2001 From: Prakhar Sharma Date: Wed, 2 Oct 2024 20:40:28 +0000 Subject: [PATCH 2/5] fixed core ui changes and added indivisual button padding fix --- .../src/modules/ui/input/button/components/Button.tsx | 2 +- .../src/modules/views/components/UpdateViewButtonGroup.tsx | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/twenty-front/src/modules/ui/input/button/components/Button.tsx b/packages/twenty-front/src/modules/ui/input/button/components/Button.tsx index 1ca8df6a7115..de07f830399a 100644 --- a/packages/twenty-front/src/modules/ui/input/button/components/Button.tsx +++ b/packages/twenty-front/src/modules/ui/input/button/components/Button.tsx @@ -341,7 +341,7 @@ const StyledButton = styled('button', { height: ${({ size }) => (size === 'small' ? '24px' : '32px')}; justify-content: ${({ justify }) => justify}; padding: ${({ theme }) => { - return `0 ${theme.spacing(1.5)}`; + return `0 ${theme.spacing(2)}`; }}; transition: background 0.1s ease; diff --git a/packages/twenty-front/src/modules/views/components/UpdateViewButtonGroup.tsx b/packages/twenty-front/src/modules/views/components/UpdateViewButtonGroup.tsx index fa40544755de..15626cfdb13c 100644 --- a/packages/twenty-front/src/modules/views/components/UpdateViewButtonGroup.tsx +++ b/packages/twenty-front/src/modules/views/components/UpdateViewButtonGroup.tsx @@ -27,7 +27,9 @@ const StyledContainer = styled.div` margin-right: ${({ theme }) => theme.spacing(2)}; position: relative; `; - +const DropdownButton = styled(Button)` + padding: ${({ theme }) => theme.spacing(1.5)}; +`; export type UpdateViewButtonGroupProps = { hotkeyScope: HotkeyScope; }; @@ -99,7 +101,7 @@ export const UpdateViewButtonGroup = ({ dropdownId={UPDATE_VIEW_BUTTON_DROPDOWN_ID} dropdownHotkeyScope={hotkeyScope} clickableComponent={ - Date: Thu, 3 Oct 2024 02:24:24 +0530 Subject: [PATCH 3/5] added Styled prefix to dropdown styled component --- .../src/modules/views/components/UpdateViewButtonGroup.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/twenty-front/src/modules/views/components/UpdateViewButtonGroup.tsx b/packages/twenty-front/src/modules/views/components/UpdateViewButtonGroup.tsx index 15626cfdb13c..2be02dc61a35 100644 --- a/packages/twenty-front/src/modules/views/components/UpdateViewButtonGroup.tsx +++ b/packages/twenty-front/src/modules/views/components/UpdateViewButtonGroup.tsx @@ -27,7 +27,7 @@ const StyledContainer = styled.div` margin-right: ${({ theme }) => theme.spacing(2)}; position: relative; `; -const DropdownButton = styled(Button)` +const StyledDropdownButton = styled(Button)` padding: ${({ theme }) => theme.spacing(1.5)}; `; export type UpdateViewButtonGroupProps = { @@ -101,7 +101,7 @@ export const UpdateViewButtonGroup = ({ dropdownId={UPDATE_VIEW_BUTTON_DROPDOWN_ID} dropdownHotkeyScope={hotkeyScope} clickableComponent={ - Date: Thu, 3 Oct 2024 02:33:30 +0530 Subject: [PATCH 4/5] corrections --- .../src/modules/views/components/UpdateViewButtonGroup.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/twenty-front/src/modules/views/components/UpdateViewButtonGroup.tsx b/packages/twenty-front/src/modules/views/components/UpdateViewButtonGroup.tsx index 2be02dc61a35..c6c06455e4f5 100644 --- a/packages/twenty-front/src/modules/views/components/UpdateViewButtonGroup.tsx +++ b/packages/twenty-front/src/modules/views/components/UpdateViewButtonGroup.tsx @@ -28,7 +28,7 @@ const StyledContainer = styled.div` position: relative; `; const StyledDropdownButton = styled(Button)` - padding: ${({ theme }) => theme.spacing(1.5)}; + padding: ${({ theme }) => theme.spacing(1)}; `; export type UpdateViewButtonGroupProps = { hotkeyScope: HotkeyScope; From ffd6d1a8d3ec078c446a2b1459706ef8f2e9718b Mon Sep 17 00:00:00 2001 From: Nitin Koche Date: Thu, 3 Oct 2024 02:35:18 +0530 Subject: [PATCH 5/5] corrections --- .../src/modules/views/components/UpdateViewButtonGroup.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/twenty-front/src/modules/views/components/UpdateViewButtonGroup.tsx b/packages/twenty-front/src/modules/views/components/UpdateViewButtonGroup.tsx index c6c06455e4f5..ffe89f6b6b60 100644 --- a/packages/twenty-front/src/modules/views/components/UpdateViewButtonGroup.tsx +++ b/packages/twenty-front/src/modules/views/components/UpdateViewButtonGroup.tsx @@ -27,7 +27,7 @@ const StyledContainer = styled.div` margin-right: ${({ theme }) => theme.spacing(2)}; position: relative; `; -const StyledDropdownButton = styled(Button)` +const StyledButton = styled(Button)` padding: ${({ theme }) => theme.spacing(1)}; `; export type UpdateViewButtonGroupProps = { @@ -101,7 +101,7 @@ export const UpdateViewButtonGroup = ({ dropdownId={UPDATE_VIEW_BUTTON_DROPDOWN_ID} dropdownHotkeyScope={hotkeyScope} clickableComponent={ -