aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/layout/AppLayout.js
diff options
context:
space:
mode:
Diffstat (limited to 'src/components/layout/AppLayout.js')
-rw-r--r--src/components/layout/AppLayout.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index ebb9849ea..7f2f707fb 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -17,6 +17,7 @@ import { isWindows } from '../../environment';
17import WorkspaceSwitchingIndicator from '../../features/workspaces/components/WorkspaceSwitchingIndicator'; 17import WorkspaceSwitchingIndicator from '../../features/workspaces/components/WorkspaceSwitchingIndicator';
18import { workspaceStore } from '../../features/workspaces'; 18import { workspaceStore } from '../../features/workspaces';
19import AppUpdateInfoBar from '../AppUpdateInfoBar'; 19import AppUpdateInfoBar from '../AppUpdateInfoBar';
20import TodosWebview from '../../features/todos/components/TodosWebview';
20 21
21function createMarkup(HTMLString) { 22function createMarkup(HTMLString) {
22 return { __html: HTMLString }; 23 return { __html: HTMLString };
@@ -39,7 +40,8 @@ const messages = defineMessages({
39 40
40const styles = theme => ({ 41const styles = theme => ({
41 appContent: { 42 appContent: {
42 width: `calc(100% + ${theme.workspaces.drawer.width}px)`, 43 // width: `calc(100% + ${theme.workspaces.drawer.width}px)`,
44 width: '100%',
43 transition: 'transform 0.5s ease', 45 transition: 'transform 0.5s ease',
44 transform() { 46 transform() {
45 return workspaceStore.isWorkspaceDrawerOpen ? 'translateX(0)' : `translateX(-${theme.workspaces.drawer.width}px)`; 47 return workspaceStore.isWorkspaceDrawerOpen ? 'translateX(0)' : `translateX(-${theme.workspaces.drawer.width}px)`;
@@ -50,6 +52,7 @@ const styles = theme => ({
50@injectSheet(styles) @observer 52@injectSheet(styles) @observer
51class AppLayout extends Component { 53class AppLayout extends Component {
52 static propTypes = { 54 static propTypes = {
55 authToken: PropTypes.string.isRequired,
53 classes: PropTypes.object.isRequired, 56 classes: PropTypes.object.isRequired,
54 isFullScreen: PropTypes.bool.isRequired, 57 isFullScreen: PropTypes.bool.isRequired,
55 sidebar: PropTypes.element.isRequired, 58 sidebar: PropTypes.element.isRequired,
@@ -82,6 +85,7 @@ class AppLayout extends Component {
82 85
83 render() { 86 render() {
84 const { 87 const {
88 authToken,
85 classes, 89 classes,
86 isFullScreen, 90 isFullScreen,
87 workspacesDrawer, 91 workspacesDrawer,
@@ -169,6 +173,7 @@ class AppLayout extends Component {
169 {services} 173 {services}
170 {children} 174 {children}
171 </div> 175 </div>
176 <TodosWebview authToken={authToken} />
172 </div> 177 </div>
173 </div> 178 </div>
174 </ErrorBoundary> 179 </ErrorBoundary>