From c40b507a67b6fe900c4ea44b7fb8eb18fd34322c Mon Sep 17 00:00:00 2001 From: "Mr. Stallion" Date: Fri, 3 Apr 2020 18:48:39 -0500 Subject: [PATCH] Dark and light theme support --- chat/CharacterSearchHistory.vue | 13 ++- chat/ConversationView.vue | 38 +++---- chat/StatusPicker.vue | 10 +- chat/preview/test-urls.txt | 2 + electron/Index.vue | 8 +- scss/_bbcode.scss | 4 +- scss/_chat.scss | 3 +- scss/_rising.scss | 52 ++++++++++ scss/themes/_chat.scss | 1 + scss/themes/chat/dark.scss | 2 +- scss/themes/chat/default.scss | 2 +- scss/themes/chat/light.scss | 2 +- scss/themes/variables/_dark_variables.scss | 53 +++++++++- scss/themes/variables/_default_variables.scss | 54 +++++++++- scss/themes/variables/_light_variables.scss | 55 ++++++++++- site/character_page/character_page.vue | 98 +++++++++---------- 16 files changed, 306 insertions(+), 91 deletions(-) create mode 100644 scss/_rising.scss diff --git a/chat/CharacterSearchHistory.vue b/chat/CharacterSearchHistory.vue index 37c7186..23e3f49 100644 --- a/chat/CharacterSearchHistory.vue +++ b/chat/CharacterSearchHistory.vue @@ -115,15 +115,20 @@ } .form-row:hover { - background-color: #20203e; - border: 1px solid #2d2d6b; + // background-color: #20203e; + // border: 1px solid #2d2d6b; + backdrop-filter: invert(30%) !important; + border-radius: 2px; } .selected-row, .form-row.selected-row:hover { - background-color: #343461; - border: 1px solid #6565b2; + /*background-color: #343461;*/ + /*border: 1px solid #6565b2;*/ + + backdrop-filter: invert(20%) !important; + border-radius: 2px; } } diff --git a/chat/ConversationView.vue b/chat/ConversationView.vue index 86c51f0..b0fb5de 100644 --- a/chat/ConversationView.vue +++ b/chat/ConversationView.vue @@ -613,7 +613,7 @@ a.btn { padding-left: 0.5rem; padding-right: 0.5rem; - color: #cbcbe5; + // color: #cbcbe5; i { margin-right: 0.4rem; @@ -731,8 +731,8 @@ .message-time, .message .message-time, .ad-viewer .message-time { - background-color: #4f4f61; - color: #dadada; + background-color: var(--messageTimeBgColor); + color: var(--messageTimeFgColor); border-radius: 3px; padding-left: 3px; padding-right: 3px; @@ -775,23 +775,23 @@ text-transform: uppercase; &.match { - background-color: rgb(0, 142, 0); - border: solid 1px rgb(0, 113, 0); + background-color: var(--scoreMatchBg); + border: solid 1px var(--scoreMatchFg); } &.weak-match { - background-color: rgb(0, 80, 0); - border: 1px solid rgb(0, 64, 0); + background-color: var(--scoreWeakMatchBg); + border: 1px solid var(--scoreWeakMatchFg); } &.weak-mismatch { - background-color: rgb(152, 134, 0); - border: 1px solid rgb(142, 126, 0); + background-color: var(--scoreWeakMismatchBg); + border: 1px solid var(--scoreWeakMismatchFg); } &.mismatch { - background-color: rgb(171, 0, 0); - border: 1px solid rgb(128, 0, 0); + background-color: var(--scoreMismatchBg); + border: 1px solid var(--scoreMismatchFg); } } } @@ -814,15 +814,15 @@ border-bottom: 1px solid rgba(255, 255, 255, 0.1); &.match { - border-left: 12px solid #048a04; - background-color: rgba(0, 110, 0, 0.47); + border-left: 12px solid var(--scoreStandoutMatchBorderColor); + background-color: var(--scoreStandoutMatchBgColor); // border-left: 12px solid #027b02; // background-color: rgba(1, 115, 1, 0.45); } &.weak-match { - border-left: 12px solid #014a01; - background-color: rgba(0, 79, 0, 0.4); + border-left: 12px solid var(--scoreStandoutWeakMatchBorderColor); + background-color: var(--scoreStandoutWeakMatchBgColor); .bbcode { filter: grayscale(0.25); @@ -831,7 +831,7 @@ } &.neutral { - border-left: 12px solid #555; + border-left: 12px solid var(--scoreStandoutNeutralBorderColor); .bbcode { filter: grayscale(0.5); @@ -845,8 +845,8 @@ }; &.weak-mismatch { - background-color: rgba(208, 188, 0, 0.0); - border-left: 12px solid rgb(138, 123, 0); + border-left: 12px solid var(--scoreStandoutWeakMismatchBorderColor); + background-color: var(--scoreStandoutWeakMismatchBgColor); .bbcode { filter: grayscale(0.7); @@ -860,7 +860,7 @@ } &.mismatch { - border-left: 12px solid #841a1a; + border-left: 12px solid var(--scoreStandoutMismatchBorderColor); .bbcode { filter: grayscale(0.8); diff --git a/chat/StatusPicker.vue b/chat/StatusPicker.vue index ca3de7d..0fd3b7d 100644 --- a/chat/StatusPicker.vue +++ b/chat/StatusPicker.vue @@ -100,15 +100,17 @@ } .form-row:hover { - background-color: #20203e; - border: 1px solid #2d2d6b; + /*background-color: #20203e;*/ + /*border: 1px solid #2d2d6b;*/ + backdrop-filter: invert(30%) !important; border-radius: 2px; } .selected-row, .form-row.selected-row:hover { - background-color: #343461; - border: 1px solid #6565b2; + /*background-color: #343461;*/ + /*border: 1px solid #6565b2;*/ + backdrop-filter: invert(20%); border-radius: 2px; } } diff --git a/chat/preview/test-urls.txt b/chat/preview/test-urls.txt index 4100b97..5654145 100644 --- a/chat/preview/test-urls.txt +++ b/chat/preview/test-urls.txt @@ -76,3 +76,5 @@ http://gfycatporn.com/deepthroat.php Derpibooru Pornhub GIFS +https://multporn.net/authors_comics/sefeiren + diff --git a/electron/Index.vue b/electron/Index.vue index 22104e6..c7e7b01 100644 --- a/electron/Index.vue +++ b/electron/Index.vue @@ -1,5 +1,5 @@