From 058ffeb8dc07dca5bd124bd24a2aaf6e7416b4f7 Mon Sep 17 00:00:00 2001 From: Valeriy Date: Mon, 28 Jan 2019 02:23:35 +0300 Subject: [PATCH] fix(client): night mode for settings page --- client/src/components/Footer/footer.css | 8 ++++++++ .../src/components/helpers/toggle-button.css | 20 +++++++++++++++++-- client/src/components/layouts/night.css | 15 +++++++------- .../components/profile/components/TimeLine.js | 1 + client/src/components/settings/honesty.css | 10 +++++++++- 5 files changed, 44 insertions(+), 10 deletions(-) diff --git a/client/src/components/Footer/footer.css b/client/src/components/Footer/footer.css index 445a3d17c2..5bf26554e0 100644 --- a/client/src/components/Footer/footer.css +++ b/client/src/components/Footer/footer.css @@ -18,3 +18,11 @@ margin-left: 5px; color: #6d6d6d; } + +.night .footer { + background: #222; +} + +.night .footer a { + color: #006400; +} diff --git a/client/src/components/helpers/toggle-button.css b/client/src/components/helpers/toggle-button.css index 4269e2cfa3..b19fc3db03 100644 --- a/client/src/components/helpers/toggle-button.css +++ b/client/src/components/helpers/toggle-button.css @@ -3,6 +3,10 @@ opacity: 1; } +.night .toggle-active { + color: #ddd; +} + .toggle-not-active.btn-primary.active { background-color: #006400; } @@ -11,6 +15,18 @@ background-color: #dedede; color: rgb(0, 49, 0); } -.toggle-not-active:hover, .toggle-not-active:focus { + +.night .toggle-not-active { + background-color: #999; + color: #333; +} + +.toggle-not-active:hover, +.toggle-not-active:focus { background-color: #006400; -} \ No newline at end of file +} + +.night .toggle-not-active:hover, +.night .toggle-not-active:focus { + color: #ddd; +} diff --git a/client/src/components/layouts/night.css b/client/src/components/layouts/night.css index d6c90f4786..1833be3db7 100644 --- a/client/src/components/layouts/night.css +++ b/client/src/components/layouts/night.css @@ -14,18 +14,18 @@ color: #ddd; } -.night .toggle-active { - color: #ddd; -} - .night input, .night textarea { background-color: #ddd; color: #333; } -.night .btn.btn-primary { - color: #ddd; +.night a { + color: #f8f8f8; +} + +.night .table-striped > tbody > tr:nth-child(odd) { + background-color: #555555; } .night .challenge-preview { @@ -35,12 +35,13 @@ color: #fff; background: #2a2a2a; } -.night .footer, + .night .challenge-instructions blockquote, .night blockquote, .night pre { background: #222; } + .night code { background-color: #242424; color: #02a902; diff --git a/client/src/components/profile/components/TimeLine.js b/client/src/components/profile/components/TimeLine.js index 8e4ba655b9..264692e50e 100644 --- a/client/src/components/profile/components/TimeLine.js +++ b/client/src/components/profile/components/TimeLine.js @@ -123,6 +123,7 @@ class Timeline extends Component { Challenge Completed + diff --git a/client/src/components/settings/honesty.css b/client/src/components/settings/honesty.css index 3ffd325d27..6ecb8f900f 100644 --- a/client/src/components/settings/honesty.css +++ b/client/src/components/settings/honesty.css @@ -5,7 +5,6 @@ .honesty-panel { padding-top: 15px; - } .honesty-panel .agreed { @@ -23,3 +22,12 @@ margin-top: 0; margin-bottom: 0; } + +.night .honesty-panel { + color: #333333; + background-color: #cccccc; +} + +.night .honesty-panel a { + color: darkgreen; +}