From 69223fed486f88ba5611ea8696099f5fb3b3ed80 Mon Sep 17 00:00:00 2001 From: Mike Murray Date: Tue, 7 Apr 2020 10:54:50 -0700 Subject: [PATCH] fix: adjust padding when drawers are open Signed-off-by: Mike Murray --- package/src/ContentLayout/ContentLayout.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/package/src/ContentLayout/ContentLayout.js b/package/src/ContentLayout/ContentLayout.js index b92629e..3f7d0ba 100644 --- a/package/src/ContentLayout/ContentLayout.js +++ b/package/src/ContentLayout/ContentLayout.js @@ -35,9 +35,15 @@ const useStyles = makeStyles((theme) => ({ overflow: "hidden" }, leadingDrawerOpen: { - paddingLeft: theme.dimensions.drawerWidth + paddingLeft: theme.dimensions.drawerWidth + theme.spacing(2) }, trailingDrawerOpen: { + paddingRight: theme.dimensions.detailDrawerWidth + theme.spacing(2) + }, + leadingDrawerOpenFullLayout: { + paddingLeft: theme.dimensions.drawerWidth + }, + trailingDrawerOpenFullLayout: { paddingRight: theme.dimensions.detailDrawerWidth } })); @@ -55,8 +61,10 @@ const ContentLayout = ({ className={ clsx(classes.root, { [classes[`${size}Content`]]: true, - [classes.leadingDrawerOpen]: isLeadingDrawerOpen, - [classes.trailingDrawerOpen]: isTrailingDrawerOpen + [classes.leadingDrawerOpen]: isLeadingDrawerOpen && size !== "full", + [classes.trailingDrawerOpen]: isTrailingDrawerOpen && size !== "full", + [classes.leadingDrawerOpenFullLayout]: isLeadingDrawerOpen && size === "full", + [classes.trailingDrawerOpenFullLayout]: isTrailingDrawerOpen && size === "full" }) } >