From 8b6eabd7712cd78fd3ffa61b56dbc9f8286a7f3b Mon Sep 17 00:00:00 2001 From: Abhinav Jha Date: Thu, 5 Mar 2020 14:11:32 +0530 Subject: [PATCH] Fix disparity in the styles of local and release builds. --- .../appsmith/FilePickerComponent.tsx | 3 ++- .../blueprint/ButtonComponent.tsx | 3 +-- .../editorComponents/NavBarItem.tsx | 4 +++- app/client/src/pages/Editor/EditorSidebar.tsx | 2 +- app/client/src/pages/Editor/WidgetsEditor.tsx | 3 +-- .../src/pages/UserAuth/StyledComponents.tsx | 24 ++++++++++--------- 6 files changed, 21 insertions(+), 18 deletions(-) diff --git a/app/client/src/components/designSystems/appsmith/FilePickerComponent.tsx b/app/client/src/components/designSystems/appsmith/FilePickerComponent.tsx index 7dbeafb367..3fce9008ce 100644 --- a/app/client/src/components/designSystems/appsmith/FilePickerComponent.tsx +++ b/app/client/src/components/designSystems/appsmith/FilePickerComponent.tsx @@ -26,7 +26,8 @@ class FilePickerComponent extends React.Component< return ( ` const ButtonWrapper = styled((props: ButtonStyleProps & IButtonProps) => ( ))` - && { + &&&& { ${ButtonColorStyles}; width: 100%; height: 100%; @@ -48,7 +48,6 @@ const ButtonWrapper = styled((props: ButtonStyleProps & IButtonProps) => ( font-family: "DM Sans"; outline: none; &.bp3-button { - min-height: auto; padding: 0px 10px; } && .bp3-button-text { diff --git a/app/client/src/components/editorComponents/NavBarItem.tsx b/app/client/src/components/editorComponents/NavBarItem.tsx index adbb088da4..02264cd3c7 100644 --- a/app/client/src/components/editorComponents/NavBarItem.tsx +++ b/app/client/src/components/editorComponents/NavBarItem.tsx @@ -27,7 +27,8 @@ const IconContainer = styled.div` `; const ItemContainer = styled.div` - a { + && { + a { display: flex; flex-direction: column; justify-content: center; @@ -53,6 +54,7 @@ const ItemContainer = styled.div` } } } +} `; class NavBarItem extends React.Component { diff --git a/app/client/src/pages/Editor/EditorSidebar.tsx b/app/client/src/pages/Editor/EditorSidebar.tsx index 999f9dc231..29ff5a8e3c 100644 --- a/app/client/src/pages/Editor/EditorSidebar.tsx +++ b/app/client/src/pages/Editor/EditorSidebar.tsx @@ -120,7 +120,7 @@ const DraftIconIndicator = styled.span<{ isHidden: boolean }>` `; const CreateNewButton = styled(BaseButton)` - && { + &&&& { border: none; color: ${props => props.theme.colors.textOnDarkBG}; height: 32px; diff --git a/app/client/src/pages/Editor/WidgetsEditor.tsx b/app/client/src/pages/Editor/WidgetsEditor.tsx index 2a953c3867..0aff63ec26 100644 --- a/app/client/src/pages/Editor/WidgetsEditor.tsx +++ b/app/client/src/pages/Editor/WidgetsEditor.tsx @@ -56,10 +56,9 @@ const WidgetsEditor = (props: EditorProps) => { const { pageId } = params; const canvasContainer: MutableRefObject = useRef(null); - const handleWrapperClick = (e: any) => { + const handleWrapperClick = () => { focusWidget && focusWidget(); selectWidget && selectWidget(); - e.preventDefault(); }; /* eslint-disable react-hooks/exhaustive-deps */ useEffect(() => { diff --git a/app/client/src/pages/UserAuth/StyledComponents.tsx b/app/client/src/pages/UserAuth/StyledComponents.tsx index 2314dc1fbf..b4b39a2584 100644 --- a/app/client/src/pages/UserAuth/StyledComponents.tsx +++ b/app/client/src/pages/UserAuth/StyledComponents.tsx @@ -11,17 +11,19 @@ export const AuthContainer = styled.section` `; export const AuthCard = styled(Card)` - width: ${props => props.theme.authCard.width}px; - background: ${props => props.theme.authCard.background}; - border-radius: ${props => props.theme.authCard.borderRadius}px; - padding: ${props => props.theme.authCard.padding}px; - box-shadow: ${props => props.theme.authCard.shadow}; - border: none; - & h1, - h5 { - padding: 0; - margin: 0; - font-weight: ${props => props.theme.fontWeights[1]}; + && { + width: ${props => props.theme.authCard.width}px; + background: ${props => props.theme.authCard.background}; + border-radius: ${props => props.theme.authCard.borderRadius}px; + padding: ${props => props.theme.authCard.padding}px; + box-shadow: ${props => props.theme.authCard.shadow}; + border: none; + & h1, + h5 { + padding: 0; + margin: 0; + font-weight: ${props => props.theme.fontWeights[1]}; + } } `;