diff options
author | haraldox <hnaumann+github@gmail.com> | 2018-02-23 12:12:54 +0100 |
---|---|---|
committer | haraldox <hnaumann+github@gmail.com> | 2018-02-23 12:12:54 +0100 |
commit | ae1014ed7d8f2532c4ec33b530662665dc16b141 (patch) | |
tree | 73f936db1a3bb797da6e29db3f53ad8e2a0f2678 /src/components | |
parent | Merge branch 'fix/copy-paste' into feature/titlebar (diff) | |
download | ferdium-app-ae1014ed7d8f2532c4ec33b530662665dc16b141.tar.gz ferdium-app-ae1014ed7d8f2532c4ec33b530662665dc16b141.tar.zst ferdium-app-ae1014ed7d8f2532c4ec33b530662665dc16b141.zip |
complete titlebar for Windows & Linux
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/layout/AppLayout.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js index 6162840be..686476317 100644 --- a/src/components/layout/AppLayout.js +++ b/src/components/layout/AppLayout.js | |||
@@ -7,6 +7,8 @@ import { TitleBar } from 'electron-react-titlebar'; | |||
7 | import InfoBar from '../ui/InfoBar'; | 7 | import InfoBar from '../ui/InfoBar'; |
8 | import globalMessages from '../../i18n/globalMessages'; | 8 | import globalMessages from '../../i18n/globalMessages'; |
9 | 9 | ||
10 | import { isMac } from '../../environment'; | ||
11 | |||
10 | function createMarkup(HTMLString) { | 12 | function createMarkup(HTMLString) { |
11 | return { __html: HTMLString }; | 13 | return { __html: HTMLString }; |
12 | } | 14 | } |
@@ -88,7 +90,7 @@ export default class AppLayout extends Component { | |||
88 | return ( | 90 | return ( |
89 | <div> | 91 | <div> |
90 | <div className="app"> | 92 | <div className="app"> |
91 | <TitleBar menu={window.franz.menu.template} icon={'assets/images/logo.svg'} /> | 93 | {!isMac && <TitleBar menu={window.franz.menu.template} icon={'assets/images/logo.svg'} />} |
92 | <div className="app__content"> | 94 | <div className="app__content"> |
93 | {sidebar} | 95 | {sidebar} |
94 | <div className="app__service"> | 96 | <div className="app__service"> |