From 7b18e70a94f47bd710dccf94e59c0c74a7d915c7 Mon Sep 17 00:00:00 2001 From: jloeve Date: Mon, 7 Dec 2020 11:26:03 +0800 Subject: [PATCH 01/10] =?UTF-8?q?fix(dark=20style):=20=E7=9B=B8=E7=B0=BF?= =?UTF-8?q?=E6=94=B6=E8=97=8F=E5=A4=B9=E7=9A=84=E6=8C=89=E9=92=AE=E6=96=87?= =?UTF-8?q?=E6=9C=AC=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit re #1267, https://github.com/the1812/Bilibili-Evolved/pull/1267#issuecomment-739511323 --- src/style/dark/dark-slice-13.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/style/dark/dark-slice-13.scss b/src/style/dark/dark-slice-13.scss index a76ce18c0..315e31f1a 100644 --- a/src/style/dark/dark-slice-13.scss +++ b/src/style/dark/dark-slice-13.scss @@ -654,6 +654,7 @@ html { .fav-main { .album-card { .btn { + @include color("e"); @include border-color(); @include background-color("2"); } From c75ca3da6477a9ed95c40e19c47666fc2ca9a406 Mon Sep 17 00:00:00 2001 From: jloeve Date: Mon, 7 Dec 2020 11:27:21 +0800 Subject: [PATCH 02/10] =?UTF-8?q?fix(dark=20style):=20=E9=9F=B3=E4=B9=90?= =?UTF-8?q?=20PLUS=20=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E9=A1=B5=E7=A0=81=E6=9C=AA=E8=B7=9F=E9=9A=8F=E4=B8=BB=E9=A2=98?= =?UTF-8?q?=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit re #1267, https://github.com/the1812/Bilibili-Evolved/pull/1267#issuecomment-739516053 --- src/style/dark/dark-slice-13.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/style/dark/dark-slice-13.scss b/src/style/dark/dark-slice-13.scss index 315e31f1a..7a5acfff7 100644 --- a/src/style/dark/dark-slice-13.scss +++ b/src/style/dark/dark-slice-13.scss @@ -794,6 +794,9 @@ html { @include theme-background-color(); } } + .current { + @include theme-background-color(); + } } } @if $module == article { From fc4d73a3fa780469b8aad5e0ba514cd7d83001cf Mon Sep 17 00:00:00 2001 From: jloeve Date: Mon, 7 Dec 2020 11:29:54 +0800 Subject: [PATCH 03/10] =?UTF-8?q?fix(dark=20style):=20=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E5=BC=95=E5=AF=BC=E5=85=B3=E6=B3=A8=E5=8D=A1=E7=89=87=E7=9A=84?= =?UTF-8?q?=E4=B8=80=E9=94=AE=E4=B8=89=E8=BF=9E=E5=8A=A8=E7=94=BB=E6=9C=AA?= =?UTF-8?q?=E8=B7=9F=E9=9A=8F=E4=B8=BB=E9=A2=98=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit re #1267, https://github.com/the1812/Bilibili-Evolved/pull/1267#issuecomment-739513533 --- src/style/dark/dark-slice-13.scss | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/style/dark/dark-slice-13.scss b/src/style/dark/dark-slice-13.scss index 7a5acfff7..ca31162fd 100644 --- a/src/style/dark/dark-slice-13.scss +++ b/src/style/dark/dark-slice-13.scss @@ -668,15 +668,18 @@ html { } } .bilibili-player-popup-area { - .bilibili-player-video-popup-item { - .bilibili-player-video-popup-follow:not(.bilibili-player-video-popup-followed) { + .bilibili-player-video-popup-follow { + @include background-color("4"); + &:not(.bilibili-player-video-popup-followed) { @include theme-background-color(); } - .bilibili-player-video-popup-three { - .bilibili-player-video-popup-active svg { - @include set-theme-color("fill"); - } - } + } + .bilibili-player-video-popup-active svg, + path[fill] { + @include set-theme-color("fill"); + } + path[stroke] { + @include set-theme-color("stroke"); } } .is-max .percentage-bar { From d1fe0a8ceb022d4165ec0f42646b4c09b530591c Mon Sep 17 00:00:00 2001 From: jloeve Date: Thu, 10 Dec 2020 11:34:43 +0800 Subject: [PATCH 04/10] =?UTF-8?q?fix(dark=20style):=20=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=EF=BC=8C=E4=B8=93=E9=A2=98=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E7=9A=84=E8=BF=94=E5=9B=9E=E9=A1=B6=E9=83=A8?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit re #1289, https://github.com/the1812/Bilibili-Evolved/issues/1289#issue-759540666 --- src/style/dark/_dark-definitions.scss | 19 +++++++++++++------ src/style/dark/dark-slice-13.scss | 5 +++++ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/style/dark/_dark-definitions.scss b/src/style/dark/_dark-definitions.scss index dd32ed030..0bb33c2ce 100644 --- a/src/style/dark/_dark-definitions.scss +++ b/src/style/dark/_dark-definitions.scss @@ -106,17 +106,24 @@ } } -@mixin back-top-btn($selector: ".back-top-btn") { - #{$selector} { +@mixin back-top-btn( + $btn-selector: ".back-top-btn", + $arrow-selector: ".arrow-icon" +) { + #{$btn-selector} { @include border-color(); @include background-color("3"); - .arrow-icon { - @include color("a"); + @if $arrow-selector { + #{$arrow-selector} { + @include color("a"); + } } &:hover { @include theme-background-color(); - .arrow-icon { - @include foreground-color(); + @if $arrow-selector { + #{$arrow-selector} { + @include foreground-color(); + } } } } diff --git a/src/style/dark/dark-slice-13.scss b/src/style/dark/dark-slice-13.scss index ca31162fd..c0ec83c3b 100644 --- a/src/style/dark/dark-slice-13.scss +++ b/src/style/dark/dark-slice-13.scss @@ -817,3 +817,8 @@ html { } } } +@each $module in topic, active { + .#{$module}-list { + @include back-top-btn(".back-top", null); + } +} From 61ad61e4bc213d7d7f3a8c5244cf949542061643 Mon Sep 17 00:00:00 2001 From: jloeve Date: Thu, 10 Dec 2020 11:48:23 +0800 Subject: [PATCH 05/10] =?UTF-8?q?fix(dark=20style):=20=E5=AF=B9=E4=BA=8E?= =?UTF-8?q?=E5=9B=BD=E5=88=9B=EF=BC=8C=E7=95=AA=E5=89=A7=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E7=9A=84=E8=BF=94=E5=9B=9E=E6=8C=89=E9=92=AE=E5=BC=95=E7=94=A8?= =?UTF-8?q?=E7=88=B6=E7=BA=A7=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/style/dark/dark-slice-13.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/style/dark/dark-slice-13.scss b/src/style/dark/dark-slice-13.scss index c0ec83c3b..a0564e0ff 100644 --- a/src/style/dark/dark-slice-13.scss +++ b/src/style/dark/dark-slice-13.scss @@ -127,7 +127,7 @@ } } .back-top-tools { - @include back-top-btn(".backup"); + @include back-top-btn(".backup", "&"); } .s-space { .follow-main { From 44cb18bf9eefe652450b517e032e149fc44904a8 Mon Sep 17 00:00:00 2001 From: jloeve Date: Thu, 10 Dec 2020 12:05:40 +0800 Subject: [PATCH 06/10] =?UTF-8?q?fix(dark=20style):=20=E6=9C=AA=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E7=8A=B6=E6=80=81=E4=B8=8B=E7=9A=84=E5=8E=9F=E7=89=88?= =?UTF-8?q?=E9=A1=B6=E6=A0=8F=E7=94=A8=E6=88=B7=E9=9D=A2=E6=9D=BF=E7=9A=84?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8C=89=E9=92=AE=E8=BE=B9=E6=A1=86=E9=A2=9C?= =?UTF-8?q?=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit re #1289, https://github.com/the1812/Bilibili-Evolved/issues/1289#issuecomment-741638603 --- src/style/dark/dark-slice-9.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/style/dark/dark-slice-9.scss b/src/style/dark/dark-slice-9.scss index e41176a50..274d01f38 100644 --- a/src/style/dark/dark-slice-9.scss +++ b/src/style/dark/dark-slice-9.scss @@ -991,7 +991,7 @@ $highlight-map: ( .hover-panel-wrap, .recommend-area-ctnr .rec-area-item, .hover-panel-wrapper, -.van-popover .btn-box .btn.reg-btn, +.van-popper-login .btn-box .btn, .van-popper-history .view-all, .at-popup, .chat-popups-section .draw-full-ctnr, From 61b38c6039c22a7b2b5e35035a69edac12c5a0f0 Mon Sep 17 00:00:00 2001 From: jloeve Date: Thu, 10 Dec 2020 12:06:55 +0800 Subject: [PATCH 07/10] =?UTF-8?q?fix(dark=20style):=20=E6=9C=AA=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E7=8A=B6=E6=80=81=E4=B8=8B=E7=9A=84=E5=8E=9F=E7=89=88?= =?UTF-8?q?=E9=A1=B6=E6=A0=8F=E7=94=A8=E6=88=B7=E9=9D=A2=E6=9D=BF=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E4=B8=8B=E6=96=B9=E7=9A=84=E5=88=86=E9=9A=94=E7=BA=BF?= =?UTF-8?q?=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/style/dark/dark-slice-13.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/style/dark/dark-slice-13.scss b/src/style/dark/dark-slice-13.scss index a0564e0ff..5b8e7a670 100644 --- a/src/style/dark/dark-slice-13.scss +++ b/src/style/dark/dark-slice-13.scss @@ -822,3 +822,6 @@ html { @include back-top-btn(".back-top", null); } } +.vp-container { + @include set-color("border-bottom-color", "4"); +} From 5f47f1b06d55ee71d4ae22a290590c373769e096 Mon Sep 17 00:00:00 2001 From: jloeve Date: Thu, 10 Dec 2020 12:38:24 +0800 Subject: [PATCH 08/10] =?UTF-8?q?fix(dark=20style):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=A5=BC=E4=B8=AD=E6=A5=BC=E7=BF=BB=E8=AF=91=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=8E=92=E7=89=88=EF=BC=88=E4=B8=8D=E5=BC=80=E5=90=AF=E7=AE=80?= =?UTF-8?q?=E5=8C=96=E8=AF=84=E8=AE=BA=E5=8C=BA=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix #1290 --- src/activity/feeds-translate/feeds-translate.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/src/activity/feeds-translate/feeds-translate.scss b/src/activity/feeds-translate/feeds-translate.scss index 8cb0d150a..3fbfca61a 100644 --- a/src/activity/feeds-translate/feeds-translate.scss +++ b/src/activity/feeds-translate/feeds-translate.scss @@ -1,7 +1,6 @@ .bb-comment .translate-container, .card-content .translate-container { margin-top: 10px; - display: inline-block; .translated { font-size: 12px; color: #aaa; From 96570bc6f8f28411018f67867e29c75c6eb3ea2f Mon Sep 17 00:00:00 2001 From: jloeve Date: Thu, 10 Dec 2020 12:43:31 +0800 Subject: [PATCH 09/10] =?UTF-8?q?fix(dark=20style):=20=E8=AF=84=E8=AE=BA?= =?UTF-8?q?=E5=8C=BA=E7=9A=84=E6=8F=90=E7=A4=BA=E9=A1=B9=E8=83=8C=E6=99=AF?= =?UTF-8?q?=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/style/dark/dark-slice-13.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/style/dark/dark-slice-13.scss b/src/style/dark/dark-slice-13.scss index 5b8e7a670..604816470 100644 --- a/src/style/dark/dark-slice-13.scss +++ b/src/style/dark/dark-slice-13.scss @@ -825,3 +825,6 @@ html { .vp-container { @include set-color("border-bottom-color", "4"); } +.bb-comment .reply-notice .notice-item { + @include theme-background-color(); +} From b2b92c5b53960cacded521ea551f7f08de30653b Mon Sep 17 00:00:00 2001 From: jloeve Date: Fri, 11 Dec 2020 14:50:27 +0800 Subject: [PATCH 10/10] =?UTF-8?q?Revert=20"fix(dark=20style):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=A5=BC=E4=B8=AD=E6=A5=BC=E7=BF=BB=E8=AF=91=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E6=8E=92=E7=89=88=EF=BC=88=E4=B8=8D=E5=BC=80=E5=90=AF?= =?UTF-8?q?=E7=AE=80=E5=8C=96=E8=AF=84=E8=AE=BA=E5=8C=BA=EF=BC=89"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 5f47f1b06d55ee71d4ae22a290590c373769e096. --- src/activity/feeds-translate/feeds-translate.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/activity/feeds-translate/feeds-translate.scss b/src/activity/feeds-translate/feeds-translate.scss index 3fbfca61a..8cb0d150a 100644 --- a/src/activity/feeds-translate/feeds-translate.scss +++ b/src/activity/feeds-translate/feeds-translate.scss @@ -1,6 +1,7 @@ .bb-comment .translate-container, .card-content .translate-container { margin-top: 10px; + display: inline-block; .translated { font-size: 12px; color: #aaa;