From deae4982e1a14bbcb1c3b5e9a5f5af5c56eb295d Mon Sep 17 00:00:00 2001 From: btzr-io Date: Sun, 6 May 2018 14:40:30 -0600 Subject: [PATCH 1/2] disable automatic dark mode when dark theme is selected --- src/renderer/page/settings/view.jsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/renderer/page/settings/view.jsx b/src/renderer/page/settings/view.jsx index 8abe5f088..a3997503a 100644 --- a/src/renderer/page/settings/view.jsx +++ b/src/renderer/page/settings/view.jsx @@ -141,6 +141,7 @@ class SettingsPage extends React.PureComponent { } = this.props; const noDaemonSettings = !daemonSettings || Object.keys(daemonSettings).length === 0; + const isDarkModeEnabled = currentTheme === 'dark'; return ( @@ -294,6 +295,7 @@ class SettingsPage extends React.PureComponent { name="automatic_dark_mode" onChange={e => this.onAutomaticDarkModeChange(e.target.checked)} checked={automaticDarkModeEnabled} + disabled={isDarkModeEnabled} postfix={__('Automatic dark mode (9pm to 8am)')} /> From 5609ef42f90c2eb57330e56cc5690a163bbd76d6 Mon Sep 17 00:00:00 2001 From: btzr-io Date: Sun, 6 May 2018 15:35:12 -0600 Subject: [PATCH 2/2] fix changelog --- CHANGELOG.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d8c212bd..1cf4143f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,16 +18,16 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/). * Add flair to snackbar ([#1313](https://github.com/lbryio/lbry-app/pull/1313)) ### Fixed - * Black screen on macOS after maximizing LBRY and then closing ([#1235](https://github.com/lbryio/lbry-app/pull/1235)) * Fix content-type not shown correctly in file description ([#863](https://github.com/lbryio/lbry-app/pull/863)) * Fix [Flow](https://flow.org/) ([#1197](https://github.com/lbryio/lbry-app/pull/1197)) - * Black screen on macOS after maximizing LBRY and then closing ([#1235](https://github.com/lbryio/lbry-app/pull/1235)) + * Fix black screen on macOS after maximizing LBRY and then closing ([#1235](https://github.com/lbryio/lbry-app/pull/1235)) * Fix dark theme ([#1034](https://github.com/lbryio/lbry-app/issues/1034)) * Fix download percentage indicator overlay ([#1271](https://github.com/lbryio/lbry-app/issues/1271)) * Fix alternate row shading for transactions on dark theme ([#1355](https://github.com/lbryio/lbry-app/issues/#1355)) - * Fix Description box on Publish (dark theme) ([#1356](https://github.com/lbryio/lbry-app/issues/#1356)) - * Fix spacing in search suggestions ([#1422])(https://github.com/lbryio/lbry-app/pull/1422)) - * Fix text/HTML files don't display correctly in-app anymore ([#1379])(https://github.com/lbryio/lbry-app/issues/1379) + * Fix description box on Publish (dark theme) ([#1356](https://github.com/lbryio/lbry-app/issues/#1356)) + * Fix spacing in search suggestions ([#1422](https://github.com/lbryio/lbry-app/pull/1422)) + * Fix text/HTML files don't display correctly in-app anymore ([#1379](https://github.com/lbryio/lbry-app/issues/1379)) + * Fix don't allow dark mode with automatic night mode enabled ([#1005](https://github.com/lbryio/lbry-app/issues/1005)) ## [0.21.3] - 2018-04-23