aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/layout
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2018-04-04 21:23:38 +0200
committerLibravatar GitHub <noreply@github.com>2018-04-04 21:23:38 +0200
commit1790b795238c2abe832285197cb88c0833bd98ca (patch)
tree89d4bc3632efc05822c0bec53a883b2d092bfd69 /src/components/layout
parentFix typo [ci skip] (diff)
parentMerge branch 'master' into release/5.0.0-beta.18 (diff)
downloadferdium-app-1790b795238c2abe832285197cb88c0833bd98ca.tar.gz
ferdium-app-1790b795238c2abe832285197cb88c0833bd98ca.tar.zst
ferdium-app-1790b795238c2abe832285197cb88c0833bd98ca.zip
5.0.0 beta.18v5.0.0-beta.18
Diffstat (limited to 'src/components/layout')
-rw-r--r--src/components/layout/AppLayout.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index 66aef1730..746775a7f 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -43,6 +43,7 @@ const messages = defineMessages({
43@observer 43@observer
44export default class AppLayout extends Component { 44export default class AppLayout extends Component {
45 static propTypes = { 45 static propTypes = {
46 isFullScreen: PropTypes.bool.isRequired,
46 sidebar: PropTypes.element.isRequired, 47 sidebar: PropTypes.element.isRequired,
47 services: PropTypes.element.isRequired, 48 services: PropTypes.element.isRequired,
48 children: PropTypes.element, 49 children: PropTypes.element,
@@ -69,6 +70,7 @@ export default class AppLayout extends Component {
69 70
70 render() { 71 render() {
71 const { 72 const {
73 isFullScreen,
72 sidebar, 74 sidebar,
73 services, 75 services,
74 children, 76 children,
@@ -90,7 +92,7 @@ export default class AppLayout extends Component {
90 return ( 92 return (
91 <div> 93 <div>
92 <div className="app"> 94 <div className="app">
93 {isWindows && <TitleBar menu={window.franz.menu.template} icon={'assets/images/logo.svg'} />} 95 {isWindows && !isFullScreen && <TitleBar menu={window.franz.menu.template} icon={'assets/images/logo.svg'} />}
94 <div className="app__content"> 96 <div className="app__content">
95 {sidebar} 97 {sidebar}
96 <div className="app__service"> 98 <div className="app__service">