From 7c9dce8c1102b398d5b3994cb776deb0f267f0ea Mon Sep 17 00:00:00 2001 From: geido Date: Tue, 25 May 2021 16:31:27 +0300 Subject: [PATCH 1/3] Fix height --- .../FiltersConfigForm/FiltersConfigForm.tsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx index 85e642c87d43..ef197efc0159 100644 --- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx +++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx @@ -86,6 +86,10 @@ const StyledDatasetContainer = styled.div` export const StyledFormItem = styled(Form.Item)` width: 49%; margin-bottom: ${({ theme }) => theme.gridUnit * 4}px; + + .ant-form-item-control-input-content > div > div { + height: auto; + } `; export const StyledCheckboxFormItem = styled(Form.Item)` From d986864ebc8e953e0c306ee34b892a553ec5371f Mon Sep 17 00:00:00 2001 From: geido Date: Tue, 25 May 2021 16:47:36 +0300 Subject: [PATCH 2/3] Fix height sidebar --- .../nativeFilters/FilterBar/FilterControls/FilterValue.tsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterValue.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterValue.tsx index 200edfa35c66..d6e146b8bb36 100644 --- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterValue.tsx +++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterValue.tsx @@ -47,6 +47,9 @@ import { useCascadingFilters } from './state'; const FilterItem = styled.div` min-height: ${({ theme }) => theme.gridUnit * 11}px; padding-bottom: ${({ theme }) => theme.gridUnit * 3}px; + & > div > div { + height: auto; + } `; const FilterValue: React.FC = ({ From 3a53e4084584c809835db3a6256f812eefc531aa Mon Sep 17 00:00:00 2001 From: geido Date: Wed, 26 May 2021 16:00:15 +0300 Subject: [PATCH 3/3] Move style --- .../FiltersConfigForm/FiltersConfigForm.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx index 3863758b4cda..f200ee1860b2 100644 --- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx +++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx @@ -88,9 +88,6 @@ export const StyledFormItem = styled(Form.Item)` width: 49%; margin-bottom: ${({ theme }) => theme.gridUnit * 4}px; - .ant-form-item-control-input-content > div > div { - height: auto; - } & .ant-form-item-control-input { min-height: ${({ theme }) => theme.gridUnit * 10}px; } @@ -100,6 +97,9 @@ export const StyledRowFormItem = styled(Form.Item)` margin-bottom: 0px; min-width: 50%; + .ant-form-item-control-input-content > div > div { + height: auto; + } & .ant-form-item-control-input { min-height: ${({ theme }) => theme.gridUnit * 10}px; }