From f72a83c249259b460aae730f61d0321d6e2c896a Mon Sep 17 00:00:00 2001 From: Philipp Hugenroth Date: Tue, 27 Jul 2021 19:14:52 +0200 Subject: [PATCH] Move header height to grid layout Signed-off-by: Philipp Hugenroth --- packages/core-components/src/layout/Header/Header.tsx | 1 - packages/core-components/src/layout/Page/Page.tsx | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/core-components/src/layout/Header/Header.tsx b/packages/core-components/src/layout/Header/Header.tsx index 227c6d1a60..3b2771e299 100644 --- a/packages/core-components/src/layout/Header/Header.tsx +++ b/packages/core-components/src/layout/Header/Header.tsx @@ -28,7 +28,6 @@ const useStyles = makeStyles(theme => ({ header: { gridArea: 'pageHeader', padding: theme.spacing(3), - height: 'fit-content', minHeight: minHeaderHeight, width: '100%', boxShadow: '0 0 8px 3px rgba(20, 20, 20, 0.3)', diff --git a/packages/core-components/src/layout/Page/Page.tsx b/packages/core-components/src/layout/Page/Page.tsx index 8d1dfe2943..f78dc038f2 100644 --- a/packages/core-components/src/layout/Page/Page.tsx +++ b/packages/core-components/src/layout/Page/Page.tsx @@ -23,7 +23,7 @@ const useStyles = makeStyles(() => ({ display: 'grid', gridTemplateAreas: "'pageHeader pageHeader pageHeader' 'pageSubheader pageSubheader pageSubheader' 'pageNav pageContent pageSidebar'", - gridTemplateRows: 'auto auto 1fr', + gridTemplateRows: 'max-content auto 1fr', gridTemplateColumns: 'auto 1fr auto', height: '100vh', overflowY: 'auto',