diff options
| author |  haraldox <hnaumann+github@gmail.com> | 2018-02-20 16:10:00 +0100 |
|---|---|---|
| committer | haraldox <hnaumann+github@gmail.com> | 2018-02-20 16:10:00 +0100 |
| commit | 08536e7e0a8995c0a94c363f6c230ec422c4671b (patch) | |
| tree | b29658ba85e2ce868e1f04d960ba76affa3d3b17 /src/components/layout/AppLayout.js | |
| parent | choose platform with environment variable `FRANZ_PLATFORM` (diff) | |
| download | ferdium-app-08536e7e0a8995c0a94c363f6c230ec422c4671b.tar.gz ferdium-app-08536e7e0a8995c0a94c363f6c230ec422c4671b.tar.zst ferdium-app-08536e7e0a8995c0a94c363f6c230ec422c4671b.zip | |
fix CSS conflicts
override `reset.scss` with `title-bar.scss`
Diffstat (limited to 'src/components/layout/AppLayout.js')
| -rw-r--r-- | src/components/layout/AppLayout.js | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js index 4f047368a..20fe61092 100644 --- a/src/components/layout/AppLayout.js +++ b/src/components/layout/AppLayout.js | |||
| @@ -89,9 +89,7 @@ export default class AppLayout extends Component { | |||
| 89 | return ( | 89 | return ( |
| 90 | <div> | 90 | <div> |
| 91 | <div className="app"> | 91 | <div className="app"> |
| 92 | <TitleBar menu={window.franz.menu.template}> | 92 | <TitleBar menu={window.franz.menu.template} icon={'assets/images/logo.svg'} /> |
| 93 | <link rel="stylesheet" type="text/css" href={require.resolve('electron-react-titlebar/assets/style.css')} /> | ||
| 94 | </TitleBar> | ||
| 95 | <div className="app__content"> | 93 | <div className="app__content"> |
| 96 | {sidebar} | 94 | {sidebar} |
| 97 | <div className="app__service"> | 95 | <div className="app__service"> |