From 2ba131a1e7d5092012bf266e125c6244ed23ba9e Mon Sep 17 00:00:00 2001
From: Chris Beer <cabeer@stanford.edu>
Date: Mon, 11 Mar 2019 08:20:08 -0700
Subject: [PATCH] Disable gutters on the companion window toolbar
---
src/components/CompanionWindow.js | 2 +-
src/containers/CompanionWindow.js | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/components/CompanionWindow.js b/src/components/CompanionWindow.js
index 2615be8ed..585009d68 100644
--- a/src/components/CompanionWindow.js
+++ b/src/components/CompanionWindow.js
@@ -35,7 +35,7 @@ export class CompanionWindow extends Component {
component="aside"
aria-label={title}
>
- <Toolbar variant="dense" className={ns('companion-window-header')}>
+ <Toolbar variant="dense" className={[position === 'left' ? classes.leftPadding : undefined, ns('companion-window-header')].join(' ')} disableGutters>
<Typography variant="h3" className={classes.windowSideBarTitle}>
{title}
</Typography>
diff --git a/src/containers/CompanionWindow.js b/src/containers/CompanionWindow.js
index e2a9615f6..3d7e6724d 100644
--- a/src/containers/CompanionWindow.js
+++ b/src/containers/CompanionWindow.js
@@ -59,6 +59,10 @@ const styles = theme => ({
positionButton: {
order: -100,
},
+ leftPadding: {
+ ...theme.mixins.gutters(),
+ paddingRight: 0,
+ },
content: {
...theme.mixins.gutters(),
overflowY: 'auto',
--
GitLab