diff options
author | 2022-05-05 01:28:21 +0100 | |
---|---|---|
committer | 2022-05-05 01:28:21 +0100 | |
commit | 28e6294d2c1077ed236ef9a7f27f4f62b8f4ef7e (patch) | |
tree | a0b4e23b1b45540cc382394f680f62ef9bb63c04 /src/components/layout/Sidebar.js | |
parent | Feature: makes Services location in sidebar changeable (#95) (diff) | |
download | ferdium-app-28e6294d2c1077ed236ef9a7f27f4f62b8f4ef7e.tar.gz ferdium-app-28e6294d2c1077ed236ef9a7f27f4f62b8f4ef7e.tar.zst ferdium-app-28e6294d2c1077ed236ef9a7f27f4f62b8f4ef7e.zip |
Fix order of the Settings Icon on sidebar when Todo is enable
Diffstat (limited to 'src/components/layout/Sidebar.js')
-rw-r--r-- | src/components/layout/Sidebar.js | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js index 91178a370..0d3a7c20c 100644 --- a/src/components/layout/Sidebar.js +++ b/src/components/layout/Sidebar.js | |||
@@ -233,26 +233,6 @@ class Sidebar extends Component { | |||
233 | <Icon icon={isAppMuted ? mdiBellOff : mdiBell} size={1.5} /> | 233 | <Icon icon={isAppMuted ? mdiBellOff : mdiBell} size={1.5} /> |
234 | </button> | 234 | </button> |
235 | ) : null} | 235 | ) : null} |
236 | {!hideSettingsButton && !this.state.isCollapsed ? ( | ||
237 | <button | ||
238 | type="button" | ||
239 | onClick={() => openSettings({ path: 'app' })} | ||
240 | className="sidebar__button sidebar__button--settings" | ||
241 | data-tip={`${intl.formatMessage( | ||
242 | globalMessages.settings, | ||
243 | )} (${settingsShortcutKey(false)})`} | ||
244 | > | ||
245 | <Icon icon={mdiCog} size={1.5} /> | ||
246 | { | ||
247 | this.props.stores.settings.app.automaticUpdates && | ||
248 | (this.props.stores.app.updateStatus === this.props.stores.app.updateStatusTypes.AVAILABLE || | ||
249 | this.props.stores.app.updateStatus === this.props.stores.app.updateStatusTypes.DOWNLOADED || | ||
250 | this.props.showServicesUpdatedInfoBar) && ( | ||
251 | <span className="update-available">•</span> | ||
252 | ) | ||
253 | } | ||
254 | </button> | ||
255 | ) : null} | ||
256 | {todosStore.isFeatureEnabledByUser && !this.state.isCollapsed ? ( | 236 | {todosStore.isFeatureEnabledByUser && !this.state.isCollapsed ? ( |
257 | <button | 237 | <button |
258 | type="button" | 238 | type="button" |
@@ -294,6 +274,26 @@ class Sidebar extends Component { | |||
294 | {this.state.tooltipEnabled && ( | 274 | {this.state.tooltipEnabled && ( |
295 | <ReactTooltip place="right" type="dark" effect="solid" /> | 275 | <ReactTooltip place="right" type="dark" effect="solid" /> |
296 | )} | 276 | )} |
277 | {!hideSettingsButton && !this.state.isCollapsed ? ( | ||
278 | <button | ||
279 | type="button" | ||
280 | onClick={() => openSettings({ path: 'app' })} | ||
281 | className="sidebar__button sidebar__button--settings" | ||
282 | data-tip={`${intl.formatMessage( | ||
283 | globalMessages.settings, | ||
284 | )} (${settingsShortcutKey(false)})`} | ||
285 | > | ||
286 | <Icon icon={mdiCog} size={1.5} /> | ||
287 | { | ||
288 | this.props.stores.settings.app.automaticUpdates && | ||
289 | (this.props.stores.app.updateStatus === this.props.stores.app.updateStatusTypes.AVAILABLE || | ||
290 | this.props.stores.app.updateStatus === this.props.stores.app.updateStatusTypes.DOWNLOADED || | ||
291 | this.props.showServicesUpdatedInfoBar) && ( | ||
292 | <span className="update-available">•</span> | ||
293 | ) | ||
294 | } | ||
295 | </button> | ||
296 | ) : null} | ||
297 | </div> | 297 | </div> |
298 | ); | 298 | ); |
299 | } | 299 | } |