diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/components/settings/settings/EditSettingsForm.js | 3 | ||||
-rw-r--r-- | src/components/settings/team/TeamDashboard.js | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index d567a47d1..dacd4d9c0 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js | |||
@@ -384,10 +384,9 @@ export default @observer class EditSettingsForm extends Component { | |||
384 | <Toggle field={form.$('showDisabledServices')} /> | 384 | <Toggle field={form.$('showDisabledServices')} /> |
385 | <Toggle field={form.$('showMessageBadgeWhenMuted')} /> | 385 | <Toggle field={form.$('showMessageBadgeWhenMuted')} /> |
386 | <Toggle field={form.$('darkMode')} /> | 386 | <Toggle field={form.$('darkMode')} /> |
387 | {isMac && <Toggle field={form.$('adaptableDarkMode')} disabled={isDarkmodeEnabled} />} | ||
388 | {isDarkmodeEnabled && ( | 387 | {isDarkmodeEnabled && ( |
389 | <> | 388 | <> |
390 | <Toggle field={form.$('adaptableDarkMode')} /> | 389 | {isMac && <Toggle field={form.$('adaptableDarkMode')} />} |
391 | <Toggle field={form.$('universalDarkMode')} /> | 390 | <Toggle field={form.$('universalDarkMode')} /> |
392 | <p | 391 | <p |
393 | className="settings__message" | 392 | className="settings__message" |
diff --git a/src/components/settings/team/TeamDashboard.js b/src/components/settings/team/TeamDashboard.js index 7e6d93997..57db1dcbd 100644 --- a/src/components/settings/team/TeamDashboard.js +++ b/src/components/settings/team/TeamDashboard.js | |||
@@ -210,7 +210,11 @@ export default @injectSheet(styles) @observer class TeamDashboard extends Compon | |||
210 | <h1 className={classes.headline}> | 210 | <h1 className={classes.headline}> |
211 | {intl.formatMessage(messages.teamsUnavailable)} | 211 | {intl.formatMessage(messages.teamsUnavailable)} |
212 | </h1> | 212 | </h1> |
213 | {intl.formatMessage(messages.teamsUnavailableInfo)} | 213 | <p className="settings__message" style={{ |
214 | borderTop: 0, marginTop: 0 | ||
215 | }}> | ||
216 | {intl.formatMessage(messages.teamsUnavailableInfo)} | ||
217 | </p> | ||
214 | </div> | 218 | </div> |
215 | </div> | 219 | </div> |
216 | ); | 220 | ); |