diff options
author | 2019-09-03 16:33:16 +0200 | |
---|---|---|
committer | 2019-09-03 16:33:16 +0200 | |
commit | a22f18094a64ff9359923c4a91ffbf81769d35f3 (patch) | |
tree | 6294b7332fbc29623d13532d48dd52fdd59de677 /src/components | |
parent | Add CTA for pro upgrade (diff) | |
parent | Merge branch 'feature/todos' into develop (diff) | |
download | ferdium-app-a22f18094a64ff9359923c4a91ffbf81769d35f3.tar.gz ferdium-app-a22f18094a64ff9359923c4a91ffbf81769d35f3.tar.zst ferdium-app-a22f18094a64ff9359923c4a91ffbf81769d35f3.zip |
Merge branch 'develop' into feature/new-pricing
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/layout/AppLayout.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js index 1976f5a50..941e60bfd 100644 --- a/src/components/layout/AppLayout.js +++ b/src/components/layout/AppLayout.js | |||
@@ -18,6 +18,7 @@ import WorkspaceSwitchingIndicator from '../../features/workspaces/components/Wo | |||
18 | import { workspaceStore } from '../../features/workspaces'; | 18 | import { workspaceStore } from '../../features/workspaces'; |
19 | import AppUpdateInfoBar from '../AppUpdateInfoBar'; | 19 | import AppUpdateInfoBar from '../AppUpdateInfoBar'; |
20 | import TrialActivationInfoBar from '../TrialActivationInfoBar'; | 20 | import TrialActivationInfoBar from '../TrialActivationInfoBar'; |
21 | import Todos from '../../features/todos/containers/TodosScreen'; | ||
21 | 22 | ||
22 | function createMarkup(HTMLString) { | 23 | function createMarkup(HTMLString) { |
23 | return { __html: HTMLString }; | 24 | return { __html: HTMLString }; |
@@ -40,7 +41,8 @@ const messages = defineMessages({ | |||
40 | 41 | ||
41 | const styles = theme => ({ | 42 | const styles = theme => ({ |
42 | appContent: { | 43 | appContent: { |
43 | width: `calc(100% + ${theme.workspaces.drawer.width}px)`, | 44 | // width: `calc(100% + ${theme.workspaces.drawer.width}px)`, |
45 | width: '100%', | ||
44 | transition: 'transform 0.5s ease', | 46 | transition: 'transform 0.5s ease', |
45 | transform() { | 47 | transform() { |
46 | return workspaceStore.isWorkspaceDrawerOpen ? 'translateX(0)' : `translateX(-${theme.workspaces.drawer.width}px)`; | 48 | return workspaceStore.isWorkspaceDrawerOpen ? 'translateX(0)' : `translateX(-${theme.workspaces.drawer.width}px)`; |
@@ -164,6 +166,7 @@ class AppLayout extends Component { | |||
164 | {services} | 166 | {services} |
165 | {children} | 167 | {children} |
166 | </div> | 168 | </div> |
169 | <Todos /> | ||
167 | </div> | 170 | </div> |
168 | </div> | 171 | </div> |
169 | </ErrorBoundary> | 172 | </ErrorBoundary> |