From 0ef8e18815a28d2c9c6bfb0c7fb9fa5c160ef78b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@spotify.com>
Date: Fri, 7 Feb 2020 13:41:09 +0100
Subject: [PATCH] Fix heights and paddings

---
 frontend/packages/app/src/components/SideBar/SideBar.tsx     | 2 +-
 .../src/components/DefaultEntityPage/DefaultEntityPage.tsx   | 5 ++---
 .../DefaultEntityPageNavbar/DefaultEntityPageNavbar.tsx      | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/frontend/packages/app/src/components/SideBar/SideBar.tsx b/frontend/packages/app/src/components/SideBar/SideBar.tsx
index c3e4e7f082..0f2468939b 100644
--- a/frontend/packages/app/src/components/SideBar/SideBar.tsx
+++ b/frontend/packages/app/src/components/SideBar/SideBar.tsx
@@ -152,7 +152,7 @@ const useStyles = makeStyles(theme => ({
     position: 'relative',
     overflow: 'visible',
     width: theme.spacing(7) + 1,
-    height: '100vh',
+    height: '100%',
   },
   drawer: {
     display: 'flex',
diff --git a/frontend/packages/core/src/components/DefaultEntityPage/DefaultEntityPage.tsx b/frontend/packages/core/src/components/DefaultEntityPage/DefaultEntityPage.tsx
index 5edbea7bf0..6accdfe1c8 100644
--- a/frontend/packages/core/src/components/DefaultEntityPage/DefaultEntityPage.tsx
+++ b/frontend/packages/core/src/components/DefaultEntityPage/DefaultEntityPage.tsx
@@ -6,7 +6,7 @@ import { Switch, Route, Redirect } from 'react-router-dom';
 import DefaultEntityPageHeader from '../DefaultEntityPageHeader';
 import DefaultEntityPageNavbar from '../DefaultEntityPageNavbar';
 
-const useStyles = makeStyles<Theme>(theme => ({
+const useStyles = makeStyles<Theme>({
   root: {
     display: 'grid',
     gridTemplateAreas: `
@@ -16,7 +16,6 @@ const useStyles = makeStyles<Theme>(theme => ({
     gridTemplateRows: 'auto 1fr',
     gridTemplateColumns: 'auto 1fr',
     minHeight: '100%',
-    paddingBottom: theme.spacing(3),
   },
   header: {
     gridArea: 'header',
@@ -27,7 +26,7 @@ const useStyles = makeStyles<Theme>(theme => ({
   content: {
     gridArea: 'content',
   },
-}));
+});
 
 const DefaultEntityPage: FC<EntityPageProps> = ({ navItems, views }) => {
   const classes = useStyles();
diff --git a/frontend/packages/core/src/components/DefaultEntityPageNavbar/DefaultEntityPageNavbar.tsx b/frontend/packages/core/src/components/DefaultEntityPageNavbar/DefaultEntityPageNavbar.tsx
index b0816a5e00..93e0b50c59 100644
--- a/frontend/packages/core/src/components/DefaultEntityPageNavbar/DefaultEntityPageNavbar.tsx
+++ b/frontend/packages/core/src/components/DefaultEntityPageNavbar/DefaultEntityPageNavbar.tsx
@@ -12,7 +12,7 @@ const useStyles = makeStyles<Theme>({
     transitionTimingFunction: 'ease-in',
     backgroundColor: '#eeeeee',
     boxShadow: '0px 0 4px 0px rgba(0,0,0,0.35)',
-    height: '100vh',
+    height: '100%',
   },
   list: {
     padding: 0,