diff options
| author |  Bennett <hello@vantezzen.io> | 2020-09-23 00:27:09 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2020-09-22 23:27:09 +0100 |
| commit | 04116a087b84dd84f4461f74f079833c57dfa479 (patch) | |
| tree | 63e47294856b65bedf5ca6ed92a3b0f3b386d323 /src/components | |
| parent | Upgrading to Electron 9 (#809) (diff) | |
| download | ferdium-app-04116a087b84dd84f4461f74f079833c57dfa479.tar.gz ferdium-app-04116a087b84dd84f4461f74f079833c57dfa479.tar.zst ferdium-app-04116a087b84dd84f4461f74f079833c57dfa479.zip | |
Update adaptable dark mode to work on all platforms (#834)
Co-authored-by: Amine Mouafik <amine@mouafik.fr>
Diffstat (limited to 'src/components')
| -rw-r--r-- | src/components/settings/settings/EditSettingsForm.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index ba7cb7317..031203308 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js | |||
| @@ -12,7 +12,7 @@ import PremiumFeatureContainer from '../../ui/PremiumFeatureContainer'; | |||
| 12 | import Input from '../../ui/Input'; | 12 | import Input from '../../ui/Input'; |
| 13 | 13 | ||
| 14 | import { FRANZ_TRANSLATION } from '../../../config'; | 14 | import { FRANZ_TRANSLATION } from '../../../config'; |
| 15 | import { isMac, isWindows } from '../../../environment'; | 15 | import { isMac } from '../../../environment'; |
| 16 | 16 | ||
| 17 | const { | 17 | const { |
| 18 | systemPreferences, | 18 | systemPreferences, |
| @@ -472,8 +472,8 @@ export default @observer class EditSettingsForm extends Component { | |||
| 472 | 472 | ||
| 473 | <Hr /> | 473 | <Hr /> |
| 474 | 474 | ||
| 475 | {(isMac || isWindows) && <Toggle field={form.$('adaptableDarkMode')} />} | 475 | <Toggle field={form.$('adaptableDarkMode')} /> |
| 476 | {!((isMac || isWindows) && isAdaptableDarkModeEnabled) && <Toggle field={form.$('darkMode')} />} | 476 | {!isAdaptableDarkModeEnabled && <Toggle field={form.$('darkMode')} />} |
| 477 | {(isDarkmodeEnabled || isAdaptableDarkModeEnabled) && ( | 477 | {(isDarkmodeEnabled || isAdaptableDarkModeEnabled) && ( |
| 478 | <> | 478 | <> |
| 479 | <Toggle field={form.$('universalDarkMode')} /> | 479 | <Toggle field={form.$('universalDarkMode')} /> |