From e8ac31139ae384bf2eaa94cabc95fe12c29e5bfe Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Wed, 16 Oct 2019 10:17:25 -0400 Subject: [PATCH] fix: dark mode style + better empty password check --- package.json | 2 +- src/ui/scss/component/_form-field.scss | 7 ++++++- src/ui/util/saved-passwords.js | 2 +- yarn.lock | 4 ++-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 34a17c9a7..09f17084f 100644 --- a/package.json +++ b/package.json @@ -130,7 +130,7 @@ "husky": "^0.14.3", "json-loader": "^0.5.4", "lbry-format": "https://github.com/lbryio/lbry-format.git", - "lbry-redux": "lbryio/lbry-redux#b09e1699eb92fef8087986a0f35b3df3977af87f", + "lbry-redux": "lbryio/lbry-redux#9919a8150998822ca997cd23418f023d64d4a3da", "lbryinc": "lbryio/lbryinc#fb2e73ab31c2b9f80a53f082843a01e3f213ca45", "lint-staged": "^7.0.2", "localforage": "^1.7.1", diff --git a/src/ui/scss/component/_form-field.scss b/src/ui/scss/component/_form-field.scss index 364600a96..454e9663a 100644 --- a/src/ui/scss/component/_form-field.scss +++ b/src/ui/scss/component/_form-field.scss @@ -53,8 +53,13 @@ textarea { } // @lbry/components specificityfixme -checkbox-element input[type='checkbox']:checked + label { +checkbox-element input[type='checkbox']:checked + label, +checkbox-element input[type='checkbox'] + label { color: lighten($lbry-black, 20%); + + [data-mode='dark'] & { + color: $lbry-gray-1; + } } fieldset-section { diff --git a/src/ui/util/saved-passwords.js b/src/ui/util/saved-passwords.js index 0ae75708b..4bfa53ad0 100644 --- a/src/ui/util/saved-passwords.js +++ b/src/ui/util/saved-passwords.js @@ -9,7 +9,7 @@ export const setSavedPassword = (value, saveToDisk) => { }); sessionPassword = value; - if (saveToDisk && value !== undefined) { + if (saveToDisk && value !== undefined && value !== null) { ipcRenderer.send('set-password', value); } }); diff --git a/yarn.lock b/yarn.lock index 47414f984..41d8059a2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6870,9 +6870,9 @@ lazy-val@^1.0.3, lazy-val@^1.0.4: yargs "^13.2.2" zstd-codec "^0.1.1" -lbry-redux@lbryio/lbry-redux#b09e1699eb92fef8087986a0f35b3df3977af87f: +lbry-redux@lbryio/lbry-redux#9919a8150998822ca997cd23418f023d64d4a3da: version "0.0.1" - resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/b09e1699eb92fef8087986a0f35b3df3977af87f" + resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/9919a8150998822ca997cd23418f023d64d4a3da" dependencies: proxy-polyfill "0.1.6" reselect "^3.0.0"