diff options
| author |  Stefan Malzner <stefan@adlk.io> | 2018-11-16 13:35:01 +0100 |
|---|---|---|
| committer | Stefan Malzner <stefan@adlk.io> | 2018-11-16 13:35:01 +0100 |
| commit | dd60aad8a479f02eab6d26ed3e26549e5f753378 (patch) | |
| tree | 02d477c636c8bcd071d9d685e637ab37f06f4965 /src/components/layout | |
| parent | Added missing dependency (diff) | |
| parent | Test linux apt install (diff) | |
| download | ferdium-app-dd60aad8a479f02eab6d26ed3e26549e5f753378.tar.gz ferdium-app-dd60aad8a479f02eab6d26ed3e26549e5f753378.tar.zst ferdium-app-dd60aad8a479f02eab6d26ed3e26549e5f753378.zip | |
Merge branch 'develop' into feature/dark-theme
Diffstat (limited to 'src/components/layout')
| -rw-r--r-- | src/components/layout/AppLayout.js | 3 | ||||
| -rw-r--r-- | src/components/layout/Sidebar.js | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js index 9ae73c336..e9b987918 100644 --- a/src/components/layout/AppLayout.js +++ b/src/components/layout/AppLayout.js | |||
| @@ -40,8 +40,7 @@ const messages = defineMessages({ | |||
| 40 | }, | 40 | }, |
| 41 | }); | 41 | }); |
| 42 | 42 | ||
| 43 | @observer | 43 | export default @observer class AppLayout extends Component { |
| 44 | export default class AppLayout extends Component { | ||
| 45 | static propTypes = { | 44 | static propTypes = { |
| 46 | isFullScreen: PropTypes.bool.isRequired, | 45 | isFullScreen: PropTypes.bool.isRequired, |
| 47 | sidebar: PropTypes.element.isRequired, | 46 | sidebar: PropTypes.element.isRequired, |
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js index fa269f216..6ea95bf88 100644 --- a/src/components/layout/Sidebar.js +++ b/src/components/layout/Sidebar.js | |||
| @@ -26,8 +26,7 @@ const messages = defineMessages({ | |||
| 26 | }, | 26 | }, |
| 27 | }); | 27 | }); |
| 28 | 28 | ||
| 29 | @observer | 29 | export default @observer class Sidebar extends Component { |
| 30 | export default class Sidebar extends Component { | ||
| 31 | static propTypes = { | 30 | static propTypes = { |
| 32 | openSettings: PropTypes.func.isRequired, | 31 | openSettings: PropTypes.func.isRequired, |
| 33 | toggleMuteApp: PropTypes.func.isRequired, | 32 | toggleMuteApp: PropTypes.func.isRequired, |