diff options
author | Stefan Malzner <stefan@adlk.io> | 2019-02-03 21:03:01 +0100 |
---|---|---|
committer | Stefan Malzner <stefan@adlk.io> | 2019-02-03 21:03:01 +0100 |
commit | ebb9735c84a19de5a37e983480b3295865d21128 (patch) | |
tree | 24754321e3cb38721ffce2db5af86d849067f7d2 /src/components | |
parent | Merge branch 'develop' (diff) | |
parent | fix(Service): Improve focus when switching services (diff) | |
download | ferdium-app-ebb9735c84a19de5a37e983480b3295865d21128.tar.gz ferdium-app-ebb9735c84a19de5a37e983480b3295865d21128.tar.zst ferdium-app-ebb9735c84a19de5a37e983480b3295865d21128.zip |
Merge branch 'develop'
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/layout/AppLayout.js | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js index 28eaa7fdc..bce792e56 100644 --- a/src/components/layout/AppLayout.js +++ b/src/components/layout/AppLayout.js | |||
@@ -9,7 +9,7 @@ import { Component as DelayApp } from '../../features/delayApp'; | |||
9 | import { Component as BasicAuth } from '../../features/basicAuth'; | 9 | import { Component as BasicAuth } from '../../features/basicAuth'; |
10 | import ErrorBoundary from '../util/ErrorBoundary'; | 10 | import ErrorBoundary from '../util/ErrorBoundary'; |
11 | 11 | ||
12 | import globalMessages from '../../i18n/globalMessages'; | 12 | // import globalMessages from '../../i18n/globalMessages'; |
13 | 13 | ||
14 | import { isWindows } from '../../environment'; | 14 | import { isWindows } from '../../environment'; |
15 | 15 | ||
@@ -51,7 +51,7 @@ export default @observer class AppLayout extends Component { | |||
51 | services: PropTypes.element.isRequired, | 51 | services: PropTypes.element.isRequired, |
52 | children: PropTypes.element, | 52 | children: PropTypes.element, |
53 | news: MobxPropTypes.arrayOrObservableArray.isRequired, | 53 | news: MobxPropTypes.arrayOrObservableArray.isRequired, |
54 | isOnline: PropTypes.bool.isRequired, | 54 | // isOnline: PropTypes.bool.isRequired, |
55 | showServicesUpdatedInfoBar: PropTypes.bool.isRequired, | 55 | showServicesUpdatedInfoBar: PropTypes.bool.isRequired, |
56 | appUpdateIsDownloaded: PropTypes.bool.isRequired, | 56 | appUpdateIsDownloaded: PropTypes.bool.isRequired, |
57 | removeNewsItem: PropTypes.func.isRequired, | 57 | removeNewsItem: PropTypes.func.isRequired, |
@@ -79,7 +79,7 @@ export default @observer class AppLayout extends Component { | |||
79 | sidebar, | 79 | sidebar, |
80 | services, | 80 | services, |
81 | children, | 81 | children, |
82 | isOnline, | 82 | // isOnline, |
83 | news, | 83 | news, |
84 | showServicesUpdatedInfoBar, | 84 | showServicesUpdatedInfoBar, |
85 | appUpdateIsDownloaded, | 85 | appUpdateIsDownloaded, |
@@ -115,14 +115,15 @@ export default @observer class AppLayout extends Component { | |||
115 | <span dangerouslySetInnerHTML={createMarkup(item.message)} /> | 115 | <span dangerouslySetInnerHTML={createMarkup(item.message)} /> |
116 | </InfoBar> | 116 | </InfoBar> |
117 | ))} | 117 | ))} |
118 | {!isOnline && ( | 118 | {/* {!isOnline && ( |
119 | <InfoBar | 119 | <InfoBar |
120 | type="danger" | 120 | type="danger" |
121 | sticky | ||
121 | > | 122 | > |
122 | <span className="mdi mdi-flash" /> | 123 | <span className="mdi mdi-flash" /> |
123 | {intl.formatMessage(globalMessages.notConnectedToTheInternet)} | 124 | {intl.formatMessage(globalMessages.notConnectedToTheInternet)} |
124 | </InfoBar> | 125 | </InfoBar> |
125 | )} | 126 | )} */} |
126 | {!areRequiredRequestsSuccessful && showRequiredRequestsError && ( | 127 | {!areRequiredRequestsSuccessful && showRequiredRequestsError && ( |
127 | <InfoBar | 128 | <InfoBar |
128 | type="danger" | 129 | type="danger" |