From 6ed1d63f1007fef6df038717d26274281fe5abec Mon Sep 17 00:00:00 2001 From: Artem Astapenko <3767150+Jamakase@users.noreply.github.com> Date: Tue, 26 Oct 2021 19:51:44 +0300 Subject: [PATCH] Fix page style. Remove bottom beige rectangle (#7364) --- .../src/components/MainPageWithScroll/MainPageWithScroll.tsx | 5 +++-- airbyte-webapp/src/components/PageTitle/PageTitle.tsx | 1 - airbyte-webapp/src/pages/SettingsPage/SettingsPage.tsx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/airbyte-webapp/src/components/MainPageWithScroll/MainPageWithScroll.tsx b/airbyte-webapp/src/components/MainPageWithScroll/MainPageWithScroll.tsx index 3827fb5f83229..d431f08125f96 100644 --- a/airbyte-webapp/src/components/MainPageWithScroll/MainPageWithScroll.tsx +++ b/airbyte-webapp/src/components/MainPageWithScroll/MainPageWithScroll.tsx @@ -3,14 +3,15 @@ import styled from "styled-components"; const Content = styled.div` overflow-y: auto; - height: calc(100% - 67px); - margin-top: -17px; padding-top: 17px; + height: 100%; `; const Page = styled.div` overflow-y: hidden; height: 100%; + display: flex; + flex-direction: column; `; /** diff --git a/airbyte-webapp/src/components/PageTitle/PageTitle.tsx b/airbyte-webapp/src/components/PageTitle/PageTitle.tsx index fefb65609e3f7..bea1ea8894318 100644 --- a/airbyte-webapp/src/components/PageTitle/PageTitle.tsx +++ b/airbyte-webapp/src/components/PageTitle/PageTitle.tsx @@ -14,7 +14,6 @@ export const MainContainer = styled.div<{ withLine?: boolean }>` padding: 20px 32px 18px; border-bottom: ${({ theme, withLine }) => withLine ? `1px solid ${theme.greyColor20}` : "none"}; - margin-bottom: ${({ withLine }) => (withLine ? "17px" : 0)}; position: relative; z-index: 2; color: ${({ theme }) => theme.darkPrimaryColor}; diff --git a/airbyte-webapp/src/pages/SettingsPage/SettingsPage.tsx b/airbyte-webapp/src/pages/SettingsPage/SettingsPage.tsx index b558eb6dccd5e..5ca6d0be209f2 100644 --- a/airbyte-webapp/src/pages/SettingsPage/SettingsPage.tsx +++ b/airbyte-webapp/src/pages/SettingsPage/SettingsPage.tsx @@ -20,9 +20,9 @@ import { CategoryItem } from "components/SideMenu/SideMenu"; const Content = styled.div` margin: 0 33px 0 27px; - height: 100%; display: flex; flex-direction: row; + padding-bottom: 15px; `; const MainView = styled.div` width: 100%;