From 5e4440bf8302289f244a7ffab0346e108c847841 Mon Sep 17 00:00:00 2001 From: JLoeve Date: Wed, 7 Apr 2021 11:39:07 +0800 Subject: [PATCH 01/13] fix(dark style): .paging-box.current fix #1667 --- src/style/dark/dark-slice-1.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/style/dark/dark-slice-1.css b/src/style/dark/dark-slice-1.css index e793bd14c..ca6fd154d 100644 --- a/src/style/dark/dark-slice-1.css +++ b/src/style/dark/dark-slice-1.css @@ -886,7 +886,6 @@ div.con header, .wrapper .modal-body .choice-wrp .battery-desp input, .wrapper .elec-main-title, .wrapper .elec-sub-title, -.paging-box .current, .paging-box .dian, .paging-box .next, .paging-box .prev, @@ -1994,6 +1993,7 @@ li.tag:hover, { background-color: var(--theme-color) !important; } +.paging-box .current, p.t:hover, p.ri-title:hover, div.r-text>.t:hover, From bc46b6caffff0259c3680e55473c6dfd11984406 Mon Sep 17 00:00:00 2001 From: JLoeve Date: Wed, 7 Apr 2021 12:05:20 +0800 Subject: [PATCH 02/13] fix(dark style): fix vip color re #1692, https://github.com/the1812/Bilibili-Evolved/issues/1692#issuecomment-812865833 --- src/style/dark/dark-slice-14.scss | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/style/dark/dark-slice-14.scss b/src/style/dark/dark-slice-14.scss index 85a2e50f8..cb3c01135 100644 --- a/src/style/dark/dark-slice-14.scss +++ b/src/style/dark/dark-slice-14.scss @@ -210,7 +210,7 @@ @include theme-stroke(); } &-playlist-item-img { - @include no-image + @include no-image; } } .remd-video-card .card-box .pic-box { @@ -223,3 +223,12 @@ .video-info .video-title .tit { @include color("e"); } +a { + &.name[style*="color:#FB7299"], + &.name[style*="color: #FB7299"], + &.name[style*="color: rgb(251, 114, 153)"], + &.username.is_vip[style*="color:#FB7299"], + &.c-pointer[style*="color: rgb(251, 114, 153)"] { + color: rgb(251, 114, 153) !important; + } +} From 239c329a7dd65b6924806bd7fe91e0e6e9c810f1 Mon Sep 17 00:00:00 2001 From: JLoeve Date: Wed, 7 Apr 2021 12:21:31 +0800 Subject: [PATCH 03/13] fix(dark style): search page > .video-item.list re #1692, https://github.com/the1812/Bilibili-Evolved/issues/1692#issuecomment-813177404 --- src/style/dark/dark-slice-14.scss | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/style/dark/dark-slice-14.scss b/src/style/dark/dark-slice-14.scss index cb3c01135..29b222893 100644 --- a/src/style/dark/dark-slice-14.scss +++ b/src/style/dark/dark-slice-14.scss @@ -232,3 +232,24 @@ a { color: rgb(251, 114, 153) !important; } } +.bili-search { + .video-item.list { + @include set-color("border-bottom-color", "4"); + .headline { + .type { + @include border-color(); + @include background-color("4"); + @include color("e"); + } + .title { + @include color("e"); + &:hover { + @include theme-color(); + } + } + } + .des { + @include color("a"); + } + } +} From 80f60408592406d0af238fa5641d18ff6c55cb1d Mon Sep 17 00:00:00 2001 From: JLoeve Date: Wed, 7 Apr 2021 12:35:27 +0800 Subject: [PATCH 04/13] =?UTF-8?q?fix(dark=20style):=20=E3=80=8C=E4=B8=80?= =?UTF-8?q?=E8=B5=B7=E7=9C=8B=E3=80=8D=E5=85=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit re #1692, https://github.com/the1812/Bilibili-Evolved/issues/1692#issue-845711242 --- src/style/dark/dark-slice-14.scss | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/style/dark/dark-slice-14.scss b/src/style/dark/dark-slice-14.scss index 29b222893..89f5a528b 100644 --- a/src/style/dark/dark-slice-14.scss +++ b/src/style/dark/dark-slice-14.scss @@ -253,3 +253,29 @@ a { } } } +.main-container .tool-bar { + .watch-info { + > span { + @include color("a"); + } + #watch-together-icon-1 { + @include fill("a"); + } + &:hover { + > span { + @include theme-color(); + } + #watch-together-icon-1 { + @include theme-fill(); + } + } + .watch-more { + @include no-shadow(); + @include background-color("4"); + @include border-color(); + .title { + @include color("e"); + } + } + } +} From cab93579d4c24c1e83c41173025444cdf55a48f1 Mon Sep 17 00:00:00 2001 From: JLoeve Date: Wed, 7 Apr 2021 14:55:15 +0800 Subject: [PATCH 05/13] fix(dark style): .error-404 img re #1289, https://github.com/the1812/Bilibili-Evolved/issues/1289#issuecomment-802849716 --- src/style/dark/dark-slice-14.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/style/dark/dark-slice-14.scss b/src/style/dark/dark-slice-14.scss index 89f5a528b..8e5cf167b 100644 --- a/src/style/dark/dark-slice-14.scss +++ b/src/style/dark/dark-slice-14.scss @@ -279,3 +279,6 @@ a { } } } +.error-container .error-404 img { + @include to-theme("blue"); +} From 01605250cdeaee34f012c2d5aa6a38824df30c38 Mon Sep 17 00:00:00 2001 From: JLoeve Date: Wed, 7 Apr 2021 14:58:58 +0800 Subject: [PATCH 06/13] fix(dark style): back top button re #1145, https://github.com/the1812/Bilibili-Evolved/pull/1145#issuecomment-731600209 --- src/style/dark/dark-slice-14.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/style/dark/dark-slice-14.scss b/src/style/dark/dark-slice-14.scss index 8e5cf167b..ac23706b1 100644 --- a/src/style/dark/dark-slice-14.scss +++ b/src/style/dark/dark-slice-14.scss @@ -282,3 +282,6 @@ a { .error-container .error-404 img { @include to-theme("blue"); } +.popular-video-container { + @include back-top-btn(); +} \ No newline at end of file From 52e91aaceb200b916aeacfccd4b7f7a0bbe079e7 Mon Sep 17 00:00:00 2001 From: JLoeve Date: Wed, 7 Apr 2021 15:05:34 +0800 Subject: [PATCH 07/13] =?UTF-8?q?fix(dark=20style):=20=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E8=AF=84=E8=AE=BA=E5=AF=B9=E8=AF=9D=E6=A1=86?= 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-798827795 --- src/style/dark/dark-slice-14.scss | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/style/dark/dark-slice-14.scss b/src/style/dark/dark-slice-14.scss index ac23706b1..259218528 100644 --- a/src/style/dark/dark-slice-14.scss +++ b/src/style/dark/dark-slice-14.scss @@ -284,4 +284,10 @@ a { } .popular-video-container { @include back-top-btn(); -} \ No newline at end of file +} +.m-layer .b-btn-cancel { + @include color("e"); + &:hover { + @include theme-color(); + } +} From c3b74d0e473e85e789bcea81e21321ac370cdc92 Mon Sep 17 00:00:00 2001 From: JLoeve Date: Wed, 7 Apr 2021 15:19:43 +0800 Subject: [PATCH 08/13] =?UTF-8?q?fix(dark=20style):=20=E4=B8=93=E6=A0=8F?= =?UTF-8?q?=E7=9A=84=20Up=20=E5=85=B3=E6=B3=A8=E6=8C=89=E9=92=AE=EF=BC=88?= =?UTF-8?q?=E5=B7=B2=E5=85=B3=E6=B3=A8=E7=8A=B6=E6=80=81=EF=BC=89?= 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-774425258 --- src/style/dark/dark-slice-1.css | 4 ++-- src/style/dark/dark-slice-14.scss | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/style/dark/dark-slice-1.css b/src/style/dark/dark-slice-1.css index ca6fd154d..e7695304d 100644 --- a/src/style/dark/dark-slice-1.css +++ b/src/style/dark/dark-slice-1.css @@ -1821,8 +1821,8 @@ a.s-btn:hover, .live-panel .more-button .more:hover::after, .coin-operated-m .mc-box.on, .tab-list .tb-item.active, -.up-info-holder .fixed-box .follow-btn-holder .follow-btn, -.up-info-holder .fixed-box .follow-btn-holder .follow-btn:hover, +.up-info-holder .fixed-box .follow-btn-holder .follow-btn:not(.followed), +.up-info-holder .fixed-box .follow-btn-holder .follow-btn:not(.followed):hover, .right-side-bar .to-comment:hover, .right-side-bar .to-top:hover, .btn-submit, diff --git a/src/style/dark/dark-slice-14.scss b/src/style/dark/dark-slice-14.scss index 259218528..698de9b36 100644 --- a/src/style/dark/dark-slice-14.scss +++ b/src/style/dark/dark-slice-14.scss @@ -291,3 +291,8 @@ a { @include theme-color(); } } +.follow-btn.followed { + @include border-color(""); + @include background-color("4"); + @include color("a"); +} From 196a6ae7c37c48adb9c5573c6b5232806754b0ea Mon Sep 17 00:00:00 2001 From: JLoeve Date: Wed, 7 Apr 2021 15:27:11 +0800 Subject: [PATCH 09/13] fix(dark style): interact dialog re #1289, https://github.com/the1812/Bilibili-Evolved/issues/1289#issuecomment-803216051 --- src/style/dark/dark-slice-13.scss | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/style/dark/dark-slice-13.scss b/src/style/dark/dark-slice-13.scss index f839885b6..d20d89f5a 100644 --- a/src/style/dark/dark-slice-13.scss +++ b/src/style/dark/dark-slice-13.scss @@ -41,17 +41,20 @@ .multi-page .cur-list .list-box li .duration { @include color("a"); } -.interact-dialog .con::before { - content: ""; - background: url(https://s1.hdslb.com/bfs/static/jinkela/video/asserts/interact-dialog.png); - filter: invert(1); - background-size: 242px 198px; - width: 242px; - height: 198px; - display: block; - position: absolute; - background-repeat: no-repeat; - clip-path: inset(60% 35% 0 35%); +.interact-dialog .dialog-body { + @include background-color("2"); + &::before { + content: ""; + background: url(https://s1.hdslb.com/bfs/static/jinkela/video/asserts/interact-dialog.png); + filter: invert(1); + background-size: 242px 198px; + width: 242px; + height: 198px; + display: block; + position: absolute; + background-repeat: no-repeat; + clip-path: inset(60% 35% 0 35%); + } } #app { .channel-sidebar { From 04f974fe551712dcbfd9b7dc429414908ec1a46d Mon Sep 17 00:00:00 2001 From: JLoeve Date: Thu, 8 Apr 2021 10:53:33 +0800 Subject: [PATCH 10/13] =?UTF-8?q?fix(dark=20style):=20=E4=B8=93=E6=A0=8F?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BE=A7=E8=BE=B9=E6=A0=8F=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit re #1692, https://github.com/the1812/Bilibili-Evolved/issues/1692#issuecomment-814664160 --- src/style/dark/dark-slice-14.scss | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/style/dark/dark-slice-14.scss b/src/style/dark/dark-slice-14.scss index 698de9b36..dc9ee1ee0 100644 --- a/src/style/dark/dark-slice-14.scss +++ b/src/style/dark/dark-slice-14.scss @@ -296,3 +296,18 @@ a { @include background-color("4"); @include color("a"); } +#article-list-index .index-holder { + .article-item:not(.on) { + .point { + @include background-color("6"); + } + } + .article-item { + .title { + @include color("e"); + &:hover { + @include theme-color(); + } + } + } +} From 8a32948af3a800b870751638f0e83fd8cebce460 Mon Sep 17 00:00:00 2001 From: JLoeve Date: Thu, 8 Apr 2021 17:03:28 +0800 Subject: [PATCH 11/13] fix(dark style): adapt watchroom re #1692, https://github.com/the1812/Bilibili-Evolved/issues/1692#issue-845711242 --- src/style/dark/dark-slice-14.scss | 158 ++++++++++++++++++++++++++++++ 1 file changed, 158 insertions(+) diff --git a/src/style/dark/dark-slice-14.scss b/src/style/dark/dark-slice-14.scss index dc9ee1ee0..41658c208 100644 --- a/src/style/dark/dark-slice-14.scss +++ b/src/style/dark/dark-slice-14.scss @@ -311,3 +311,161 @@ a { } } } +.main-container .bottom-brief-introduction { + @include background-color("2"); +} +.fullscreen-loading .tv-bg + .container { + @include background-color(); + .retry-btn { + @include theme-background-color(); + } +} +[style*="color: #00A1D6"] { + @include theme-color(); +} +.main-show-c { + .film-change-page { + .search { + .append { + @include theme-background-color(); + } + } + .list-container { + .season-item { + .change-btn { + @include theme-border-color(); + @include theme-color(); + &:hover { + @include theme-background-color(); + @include color("f"); + } + } + } + } + } + .plp-r { + .tab { + .title-active { + @include theme-color(); + } + } + .chat-container { + .user-guide { + .top-c { + .l .switch-c.checked { + @include theme-background-color(); + } + .r:hover { + @include theme-color(); + svg g g { + @include theme-fill(); + } + } + } + .user-share { + @include background-color("2"); + .share-content { + @include background-color("2"); + .left { + .share-btn { + &:hover { + span, + i { + @include theme-color(); + } + } + span, + i { + @include color("a"); + } + } + .copy-action { + .copy-title { + @include color("a"); + } + input[type="text"] { + @include background-color(); + @include color("e"); + @include border-color("4"); + } + .copy-btn { + @include theme-background-color(); + } + } + } + .right { + ::after { + @include background-color("6"); + } + } + } + } + } + .input-area { + .text-c { + @include set-theme-color("caret-color"); + } + .input-c.border { + @include theme-border-color(); + } + } + .static-popup { + @include border-color(); + @include background-color("4"); + .emoji { + @include background-color("4"); + &:hover { + @include background-color("2"); + } + } + } + } + .play-list { + .header { + .change-film { + @include theme-background-color(); + } + } + .other-item { + .current-play { + @include to-theme("blue"); + } + } + } + } +} +#user-card-container { + @include theme-border-color(); + @include background-color("4"); + .face-cc { + @include border-color("4"); + } + .info .name.vip-red-name { + color: rgb(251, 114, 153) !important; + } +} +.dialog-base-wrapper .popup-content .ogv-dialog-confirm { + @include background-color("4"); + .close .icon:hover { + @include theme-color(); + svg path { + @include theme-fill(); + } + } + .title { + @include set-color("border-bottom-color", "6"); + } + .short-msg .content { + @include color("a"); + } + .bottom-oper { + .btn.cancel { + @include border-color(); + @include background-color("6"); + @include color("e"); + } + .btn.submit { + @include theme-background-color(); + } + } +} From 5ed8b8249feaf3897feae2705acc8c3fafe70b1f Mon Sep 17 00:00:00 2001 From: JLoeve Date: Thu, 8 Apr 2021 17:15:19 +0800 Subject: [PATCH 12/13] refactor(dark style): add vip color mixins --- src/style/dark/_dark-definitions.scss | 9 +++++++++ src/style/dark/dark-slice-14.scss | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/style/dark/_dark-definitions.scss b/src/style/dark/_dark-definitions.scss index a49a86d08..b9235c85e 100644 --- a/src/style/dark/_dark-definitions.scss +++ b/src/style/dark/_dark-definitions.scss @@ -59,6 +59,15 @@ @include set-theme-color("stroke", $level); } +$vip-color: "FB7299"; + +@mixin vip-color() { + @include set-color("color", $vip-color) +} +@mixin vip-background-color() { + @include set-color("background-color", $vip-color) +} + @mixin foreground-background-color($level: "") { @include set-foreground-color("background-color", $level); } diff --git a/src/style/dark/dark-slice-14.scss b/src/style/dark/dark-slice-14.scss index 41658c208..2e484ad9a 100644 --- a/src/style/dark/dark-slice-14.scss +++ b/src/style/dark/dark-slice-14.scss @@ -229,7 +229,7 @@ a { &.name[style*="color: rgb(251, 114, 153)"], &.username.is_vip[style*="color:#FB7299"], &.c-pointer[style*="color: rgb(251, 114, 153)"] { - color: rgb(251, 114, 153) !important; + @include vip-color(); } } .bili-search { @@ -441,7 +441,7 @@ a { @include border-color("4"); } .info .name.vip-red-name { - color: rgb(251, 114, 153) !important; + @include vip-color(); } } .dialog-base-wrapper .popup-content .ogv-dialog-confirm { From 8e1990ffdb3246b6d54697510c65d809f1b97a0e Mon Sep 17 00:00:00 2001 From: JLoeve Date: Thu, 8 Apr 2021 17:20:50 +0800 Subject: [PATCH 13/13] style(dark style): add semi-colons --- src/style/dark/_dark-definitions.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/style/dark/_dark-definitions.scss b/src/style/dark/_dark-definitions.scss index b9235c85e..f1f274c8f 100644 --- a/src/style/dark/_dark-definitions.scss +++ b/src/style/dark/_dark-definitions.scss @@ -62,10 +62,10 @@ $vip-color: "FB7299"; @mixin vip-color() { - @include set-color("color", $vip-color) + @include set-color("color", $vip-color); } @mixin vip-background-color() { - @include set-color("background-color", $vip-color) + @include set-color("background-color", $vip-color); } @mixin foreground-background-color($level: "") {