From 83a11e3f27e020dd0d2e1cc2cb4339d4eb7d2ac3 Mon Sep 17 00:00:00 2001 From: the1812 Date: Thu, 30 Jun 2022 09:07:32 +0800 Subject: [PATCH 01/24] Fix season logo size --- .../lib/components/style/custom-navbar/logo/NavbarLogo.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/registry/lib/components/style/custom-navbar/logo/NavbarLogo.vue b/registry/lib/components/style/custom-navbar/logo/NavbarLogo.vue index 90354a31f..5a60735eb 100644 --- a/registry/lib/components/style/custom-navbar/logo/NavbarLogo.vue +++ b/registry/lib/components/style/custom-navbar/logo/NavbarLogo.vue @@ -64,7 +64,8 @@ export default Vue.extend({ } } &.season { - transform: scale(1.15); + height: 36px; + // transform: scale(1.15); filter: drop-shadow(0 0 2px #0002); } } From 66575b4cdb29ee67ad8f4dd56ab102b80a96ab52 Mon Sep 17 00:00:00 2001 From: the1812 Date: Mon, 4 Jul 2022 09:15:20 +0800 Subject: [PATCH 02/24] Fix missing console methods (fix #3462) --- src/core/utils/log.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/core/utils/log.ts b/src/core/utils/log.ts index 1a1b8d790..2a18361df 100644 --- a/src/core/utils/log.ts +++ b/src/core/utils/log.ts @@ -141,6 +141,7 @@ export const useScopedConsole = (config: ScopedConsoleConfig | string) => { ]) const scopedConsole = { + ...unsafeWindow.console, ...console, } From 15e0bf7dca0d4f8375c6150116fc47aad189a741 Mon Sep 17 00:00:00 2001 From: the1812 Date: Sat, 9 Jul 2022 14:39:18 +0800 Subject: [PATCH 03/24] Update dark styles (#2615) --- .../components/style/dark-mode/dark-mode.scss | 1 + .../style/dark-mode/dark-slice-14.scss | 14 +- .../style/dark-mode/dark-slice-15.scss | 41 ++ .../style/dark-mode/dark-slice-16.scss | 2 +- .../style/dark-mode/dark-slice-17.scss | 696 ++++++++++++++++++ .../style/dark-mode/dark-slice-9.scss | 3 +- .../style/dark-mode/old/dark-slice-1.css | 1 - .../style/dark-mode/old/dark-slice-2.css | 14 - .../style/dark-mode/old/dark-slice-3.css | 3 +- .../style/dark-mode/old/dark-slice-4.css | 5 - .../style/dark-mode/old/dark-slice-6.css | 3 - .../style/dark-mode/old/dark-slice-8.css | 4 - 12 files changed, 751 insertions(+), 36 deletions(-) create mode 100644 registry/lib/components/style/dark-mode/dark-slice-17.scss diff --git a/registry/lib/components/style/dark-mode/dark-mode.scss b/registry/lib/components/style/dark-mode/dark-mode.scss index 848dc0abb..2291fa223 100644 --- a/registry/lib/components/style/dark-mode/dark-mode.scss +++ b/registry/lib/components/style/dark-mode/dark-mode.scss @@ -14,4 +14,5 @@ @import "./dark-slice-14.scss"; @import "./dark-slice-15.scss"; @import "./dark-slice-16.scss"; +@import "./dark-slice-17.scss"; @import "./dark-navbar.scss"; \ No newline at end of file diff --git a/registry/lib/components/style/dark-mode/dark-slice-14.scss b/registry/lib/components/style/dark-mode/dark-slice-14.scss index 611858ea5..d1030849b 100644 --- a/registry/lib/components/style/dark-mode/dark-slice-14.scss +++ b/registry/lib/components/style/dark-mode/dark-slice-14.scss @@ -303,10 +303,16 @@ a { @include theme-color(); } } -.follow-btn.followed { - @include border-color(""); - @include background-color("4"); - @include color("a"); +.follow-btn { + &.following, + &.followed { + @include border-color(""); + @include background-color("4"); + @include color("a"); + path { + @include fill('a'); + } + } } #article-list-index .index-holder { .article-item:not(.on) { diff --git a/registry/lib/components/style/dark-mode/dark-slice-15.scss b/registry/lib/components/style/dark-mode/dark-slice-15.scss index c545fb634..7c0bc314e 100644 --- a/registry/lib/components/style/dark-mode/dark-slice-15.scss +++ b/registry/lib/components/style/dark-mode/dark-slice-15.scss @@ -28,6 +28,9 @@ .bui-dropdown-item { @include color("e"); @include background-color(); + &::before { + @include hide(); + } &:hover { @include theme-color(); @include background-color("2"); @@ -1037,6 +1040,7 @@ $media-types: (video, bangumi, cheese, live, manga, movie, ogv, article); @include background-color("6"); } } +.reply-warp, .up-info { .u-face .u-face__avatar { @include background-color("4"); @@ -1046,6 +1050,13 @@ $media-types: (video, bangumi, cheese, live, manga, movie, ogv, article); @include background-color("4"); } } +.user-card-avatar, +.up-info-v1 { + .bili-avatar { + @include no-image(); + @include background-color("4"); + } +} .v-wrap .float-nav { &__btn--fixed, .nav-btn-item { @@ -1059,6 +1070,36 @@ $media-types: (video, bangumi, cheese, live, manga, movie, ogv, article); } } .user-card { + .card-user-name { + @include color('e'); + } + .card-social-info { + > a { + @include color('e'); + .social-info-title { + @include color('a'); + } + } + } + .card-sign { + @include color('a'); + } + .card-btn-warp { + .card-attention-btn { + @include theme-background-color(); + @include border-color(); + @include foreground-color(); + &.attention { + @include background-color('4'); + @include color('e'); + } + } + .card-message-btn { + @include border-color('8'); + @include color('e'); + @include background-color(); + } + } .info p { @include color("e"); } diff --git a/registry/lib/components/style/dark-mode/dark-slice-16.scss b/registry/lib/components/style/dark-mode/dark-slice-16.scss index c42f7dd71..efba55d17 100644 --- a/registry/lib/components/style/dark-mode/dark-slice-16.scss +++ b/registry/lib/components/style/dark-mode/dark-slice-16.scss @@ -1,6 +1,6 @@ @import './dark-definitions'; -#app .bg { +#app > .bg { @include no-image(); } @mixin dyn-container-skeleton() { diff --git a/registry/lib/components/style/dark-mode/dark-slice-17.scss b/registry/lib/components/style/dark-mode/dark-slice-17.scss new file mode 100644 index 000000000..01d274393 --- /dev/null +++ b/registry/lib/components/style/dark-mode/dark-slice-17.scss @@ -0,0 +1,696 @@ +@import './dark-definitions'; + +.video-info-v1 .video-data { + @include color('a'); + .item { + svg path { + @include fill('a'); + } + } +} +.members-info-v1 { + .normal-members-header { + @include background-color('4'); + @include color('e'); + .person { + @include color('a'); + } + .btn path { + @include fill('e'); + } + } + .normal-members-container { + .avatar { + @include border-color('4'); + @include background-color('3'); + } + .upname { + @include color('e'); + &.is-vip { + @include vip-color(); + } + } + .info-tag { + @include color('a'); + } + .attention { + @include theme-background-color(); + @include foreground-color(); + } + } +} +.up-info-v1 { + .up-info_right_message { + &, + & i { + @include color('8'); + } + } + .charge-btn { + @include background-color(); + @include theme-border-color('80'); + @include theme-color('80'); + &:hover { + @include theme-border-color(); + @include theme-color(); + } + } +} +.user-card-m-exp { + @include background-color('3'); + @include border-color(); + .social { + a, + span { + @include color('e'); + .tip_text { + @include color('a'); + } + } + } + .btn-box { + .like { + @include theme-background-color(); + &, + & .plus { + @include foreground-color(); + } + &:hover { + opacity: 0.8; + } + } + .liked { + @include background-color('4'); + &, + & .plus { + @include color('a'); + } + &:hover, + &:hover .plus { + @include color('e'); + } + } + .message { + @include color('e'); + } + } +} +.float-nav-exp, +.fixed-nav { + .nav-menu { + .item { + @include color('e'); + @include background-color('3'); + @include border-color(); + .item-icon path { + @include fill('e'); + } + &:hover { + @include theme-background-color(); + @include foreground-color(); + .item-icon path { + @include foreground-fill(); + } + } + } + } +} +.bui-collapse-header { + .bui-collapse-arrow-text { + .arrow-icon { + @include fill('e'); + } + } +} +.recommend-list-v1 { + .rec-title { + @include color('e'); + } + .next-button { + @include color('a'); + } + .split-line { + @include background-color('5'); + } + .rec-footer { + @include background-color('3'); + @include color('e'); + } +} +.video-page-special-card-small, +.video-page-card-small { + .pic-box { + @include background-color('3'); + } + .info .title { + @include color('e'); + &:hover { + @include theme-color(); + } + } + .playinfo, + .upname a { + @include color('a'); + svg path { + @include fill('a'); + } + } +} +.bilibili-player-video-sendbar .bilibili-player-video-danmaku-root { + .bilibili-player-video-btn-danmaku { + @include fill('a'); + &:hover { + @include fill('e'); + } + } + .bilibili-player-video-danmaku-input::-webkit-input-placeholder { + @include color('8'); + } + .bilibili-player-video-danmaku { + &-setting, + &-switch { + @include fill('a'); + &:hover { + @include fill('e'); + } + } + } + .bui-danmaku-switch-on { + path[fill] { + @include theme-fill(); + } + } +} +.video-toolbar-v1 { + .toolbar-left { + @include color('8'); + > span { + @include color('8'); + @include fill('8'); + .info-text { + @include color('8'); + } + &:hover, + &.on { + @include theme-color(); + @include theme-fill(); + .info-text { + @include theme-color(); + } + } + } + } + .toolbar-right { + @include color('a'); + > div, + > span { + @include color('8'); + @include fill('8'); + &:hover { + @include theme-color(); + @include theme-fill(); + } + } + } +} +.van-popover.van-more { + @include background-color('3'); + @include border-color('8884'); + .more_dropdown { + li { + @include color('e'); + @include fill('e'); + } + } +} +.video-desc-v1 { + .desc-info { + @include color('e'); + a { + @include theme-color(); + } + } + .toggle-btn span { + @include color('e'); + } +} +.s_tag-v1 { + @include border-color('4'); + .tag-area { + .tag { + @include background-color(); + &-more, + .tag-link { + @include color('e'); + @include background-color('3'); + > svg { + @include fill('e'); + } + } + .tag-icon { + @include to-theme('blue'); + } + .rarrow-icon { + @include fill('e'); + } + &-more:hover, + &:hover .tag-link { + @include theme-background-color(); + @include foreground-color(); + > svg { + @include foreground-fill(); + } + } + .tag-channel-pane-exp { + @include background-color('3'); + .channel-cover { + @include border-color('3'); + } + .channel-title { + @include color('e'); + } + .channel-desc { + @include color('a'); + } + .channel-btns { + &__link { + @include theme-border-color(); + @include theme-color(); + } + &__subs { + @include theme-background-color(); + @include foreground-color(); + @include border-color(); + &.is-subs { + @include background-color('4'); + @include color('8'); + } + } + } + } + } + } +} +.activity-m-v1 { + @include background-color(); + .inside-wrp { + @include border-color(); + @include background-color('3'); + .left { + @include color('e'); + } + .right { + .inside-bg::before { + background-image: linear-gradient(to right, #333, transparent 30%) !important; + } + } + } +} +.reply-navigation { + .nav-title { + @include color('e'); + .total-reply { + @include color('a'); + } + } + .nav-sort { + @include color('8'); + .time-sort:hover, + .hot-sort:hover { + @include theme-color(); + } + &.time .time-sort, + &.hot .hot-sort { + @include color('e'); + } + } +} +.reply-warp { + .reply-box-textarea::-webkit-input-placeholder { + @include color('8'); + } + .fixed-reply-box { + .reply-box { + @include background-color('2'); + @include border-color('5'); + } + } + .reply-box-send { + @include theme-background-color('50'); + .send-text { + @include foreground-color('50'); + } + &::after { + @include hide(); + } + &.send-active { + @include theme-background-color(); + .send-text { + @include foreground-color(); + } + } + } + .reply-box-emoji { + .emoji-btn { + @include border-color('4'); + @include color('a'); + .box-emoji-icon path { + @include fill('a'); + } + &:hover { + @include color('e'); + .box-emoji-icon path { + @include fill('e'); + } + } + } + } + .emoji-panel { + @include border-color('8884'); + @include color('e'); + .emoji-title { + @include background-color('3'); + } + .emoji-content { + @include background-color('3'); + .emoji-info:hover { + @include background-color('5'); + } + } + .emoji-tab { + @include background-color('4'); + .emoji-type { + &.current-type { + @include background-color('5'); + } + &:hover { + @include background-color('6'); + } + } + } + .emoji-slider { + .svg-icon { + &[style*='c9ccd0'] { + @include color('8'); + } + &[style*='61666d'] { + @include color('e'); + } + } + } + } + $prefixes: ('', 'sub-'); + @each $prefix in $prefixes { + .#{$prefix}user-info { + .#{$prefix}user-name { + @include color('c'); + } + } + .#{$prefix}reply-content { + @include color('e'); + .user-link { + @include theme-color(); + } + } + .#{$prefix}reply-info { + @include color('a'); + .svg-icon { + &.dislike, + &.like { + @include color('a'); + &:hover { + @include theme-color(); + } + } + &.liked, + &.disliked { + @include theme-color(); + ~ span { + @include theme-color(); + } + } + } + .#{$prefix}reply-btn { + &:hover { + @include theme-color(); + } + } + .#{$prefix}reply-operation-warp { + .operation-icon { + @include color('a'); + } + &:hover { + .operation-icon { + @include theme-color(); + } + } + .operation-list { + @include background-color('3'); + @include color('e'); + .operation-option { + &:hover { + @include background-color('4'); + .option-title { + @include theme-color(); + } + } + } + } + } + } + .#{$prefix}reply-tag-item { + @include background-color('3'); + @include color('e'); + } + } + .reply-item { + .content-warp { + @include border-color('4'); + } + } + .view-more { + @include color('a'); + .view-more-btn { + @include theme-color(); + } + .view-more-pagination { + @include color('a'); + .pagination-btn, + .pagination-page-number { + &:hover, + &.current-page { + @include theme-color(); + } + } + } + } + .reply-end { + @include color('a'); + } +} +.coin-operated-m-exp { + @include background-color('3'); + .icon.close { + @include to-white(); + } + .coin-title { + @include color('e'); + span { + @include theme-color(); + } + } + .mc { + &-box { + @include border-color('8'); + .c-num { + @include color('e'); + } + &.on { + @include theme-border-color(); + .c-num { + @include theme-color(); + } + } + } + } + .like-checkbox { + @include color('e'); + input[type='checkbox'] { + &:checked + i { + @include to-theme('blue'); + } + } + } + .coin-bottom { + .tips { + @include color('a'); + } + } +} +.follow-dialog-wrap-exp, +.collection-m-exp { + @include background-color('3'); + .title { + @include color('e'); + @include border-color('5'); + i.close { + @include to-white(); + } + } + .special-tip { + @include color('a'); + } + .bottom { + @include border-color('5'); + .submit-move { + @include theme-background-color(); + @include foreground-color(); + &.disable { + @include background-color('5'); + @include color('8'); + } + } + } +} +.share_dropdown { + @include color('e'); + .box-right { + @include border-color('4'); + } + .share-link { + @include background-color('4'); + #link_copy { + @include background-color(); + @include color('e'); + } + .btn { + @include theme-color(); + } + } +} + +.player-auxiliary-setting-menu-wrap { + @include background-color('3'); + @include border-color('8884'); + .player-auxiliary-setting-menu-list { + @include color('e'); + &::before { + @include hide(); + } + &:hover { + @include background-color('2'); + } + } +} +.player-auxiliary-adv-danmaku { + @include border-color('4'); + * { + // 这个不能用 important + background-color: #222; + color: #eee; + } + .mask::after { + @include background-color('222A'); + } +} +.player-auxiliary-danmaku-wrap { + @include background-color(); +} +.player-auxiliary-danmaku-function { + @include background-color(); + + .player-auxiliary-danmaku-multiple-control { + @include background-color('2'); + } + [class*='player-auxiliary-danmaku-btn-'] { + @include background-color(); + } +} +.player-auxiliary-block-wrap { + @include border-color('4'); +} +.player-auxiliary-modal-container { + @include border-color('8884'); + .player-auxiliary-modal-header { + @include background-color(); + } +} +.player-auxiliary-modal-close.bpm-btn { + @include background-color(); + i { + @include color('a'); + } +} +.fav-list-container { + .nav-add { + .icon { + @include to-gray(); + } + .text { + @include color('e'); + } + } +} +.edit-media-list { + .edit-info { + .cover-title { + @include color('e'); + } + .upload-cover:not([style*='background-image']) { + filter: invert(1); + } + } + .name-input { + @include border-color('4'); + @include background-color(); + @include color('e'); + &::-webkit-input-placeholder { + @include color('8'); + } + } + .media-list-intro { + &::-webkit-input-placeholder { + @include color('8'); + } + } + .intro-num-limit, + .name-num-limit { + @include color('a'); + } +} +.upload-center-clip { + .head-wrap { + @include border-color('6'); + } + .img-clip-title { + @include color('e'); + } + .img-clip-tips { + @include color('a'); + } + .reset-img .reset-select { + @include color('a'); + .icon-reset { + @include to-gray(); + } + } + .modal-footer { + .cancel-btn { + @include border-color('6'); + @include color('e'); + } + .confirm-btn { + @include theme-background-color(); + @include foreground-color(); + @include border-color(); + } + } +} +.favList-info { + .favInfo-cover.empty { + filter: invert(0.8); + .fav-invalid { + filter: invert(1); + } + } +} diff --git a/registry/lib/components/style/dark-mode/dark-slice-9.scss b/registry/lib/components/style/dark-mode/dark-slice-9.scss index 2275acc32..0ac73dacd 100644 --- a/registry/lib/components/style/dark-mode/dark-slice-9.scss +++ b/registry/lib/components/style/dark-mode/dark-slice-9.scss @@ -1003,8 +1003,7 @@ $highlight-map: ( @include border-color("3"); } .manga-navbar .search-bar .confirm-btn .search-icon, -.container .level-intro .svg-icon, -#page-fav .fav-sidenav .icon:not(.icon-cursor) { +.container .level-intro .svg-icon { @include to-white(); } .side-bar-btn .size-bar-text { diff --git a/registry/lib/components/style/dark-mode/old/dark-slice-1.css b/registry/lib/components/style/dark-mode/old/dark-slice-1.css index 45a7a802e..01717f894 100644 --- a/registry/lib/components/style/dark-mode/old/dark-slice-1.css +++ b/registry/lib/components/style/dark-mode/old/dark-slice-1.css @@ -591,7 +591,6 @@ div.drag-bar, .be-pager-total, .tabs a, #id-card .idc-auth-description, -#page-fav .fav-sidenav .nav-title .text, #page-fav .fav-main .fav-meta, #page-fav .fav-main .filter-item .filter-type .be-dropdown-item i, .wrapper .edit-video-modal .edit-video-subtitle, diff --git a/registry/lib/components/style/dark-mode/old/dark-slice-2.css b/registry/lib/components/style/dark-mode/old/dark-slice-2.css index 7e4ca88b5..4d542c9c3 100644 --- a/registry/lib/components/style/dark-mode/old/dark-slice-2.css +++ b/registry/lib/components/style/dark-mode/old/dark-slice-2.css @@ -31,11 +31,9 @@ li.season-item .season-body .season-title span.follow, .pagelistbox .p, .sponsor-rank-item.special .sp-right .sp-msg, .player-auxiliary-danmaku-date-picker-container, -.player-auxiliary-setting-menu-wrap .player-auxiliary-setting-menu-list:hover, .player-auxiliary-block-tabpanel-row.player-auxiliary-border, .player-auxiliary-block-list .player-auxiliary-block-line, .player-auxiliary-context-menu-container, -.player-auxiliary-modal-container, .gui-settings-box li.category, .main-container .player-wrapper, .big-gift-btn-home, @@ -132,9 +130,6 @@ a.bp_box_bot_click, .project-list .project-list-item, .ban-app .case-tip, .groom-module, -.danmaku-wrap .player-auxiliary-auxiliary-area .player-auxiliary-danmaku-wrap, -.player-auxiliary-setting-menu-wrap .player-auxiliary-setting-menu-list, -.player-auxiliary-setting-menu-wrap, .player-auxiliary-block-string, .player-auxiliary-block-string-short, .bui-button.bui-button-gray, @@ -246,10 +241,6 @@ a.bp_box_bot_click, { background-color: #2229 !important; } -.mask::after -{ - background-color: hsla(0,0%,0%,.7) !important; -} .news-list .news-item .date, .empty-hint, @@ -596,7 +587,6 @@ button.button.more, .sponsor-rank-item.special .sp-right .sp-user:not(.vip) .sp-name, .player-auxiliary-auxiliary-area .player-auxiliary-filter-title, .bui-button.bui-button-gray2:hover, -.player-auxiliary-setting-menu-wrap .player-auxiliary-setting-menu-list, .player-auxiliary-block-tabpanel-row.special-title .player-auxiliary-block-label, .player-auxiliary-block-string, .player-auxiliary-block-string-short, @@ -903,10 +893,7 @@ button.button.more, .media-sponsor-wrapper, .sponsor-rank-item.special .sp-right .sp-msg, .player-auxiliary-danmaku-date-picker-container, -.player-auxiliary-setting-menu-wrap, -.danmaku-wrap .player-auxiliary-block-wrap, .player-auxiliary-context-menu-container, -.player-auxiliary-modal-container, .player-auxiliary-modal-btns .bpm-btn, .announcement-cntr, .side-bar, @@ -1430,7 +1417,6 @@ button.button.more:hover, .wrapper .elec-sub-title .exp, .wrapper .elec-sub-title .vip-point, .player-auxiliary-auxiliary-area .player-auxiliary-filter-menu:hover, -.player-auxiliary-setting-menu-wrap .player-auxiliary-setting-menu-list:hover, .bui-button.bui-button-text, .bui-tabs .bui-tabs-header .bui-tabs-header-item.bui-tabs-header-item-active, .player-auxiliary-block-list .player-auxiliary-block-line-state, diff --git a/registry/lib/components/style/dark-mode/old/dark-slice-3.css b/registry/lib/components/style/dark-mode/old/dark-slice-3.css index 1425663d2..8940f87a7 100644 --- a/registry/lib/components/style/dark-mode/old/dark-slice-3.css +++ b/registry/lib/components/style/dark-mode/old/dark-slice-3.css @@ -88,8 +88,7 @@ div#square.container, background-color: #222 !important; } .article-holder .error-card .video-holder .video-cover, -.article-holder .error-card .video-holder p, -.player-auxiliary-danmaku-function .player-auxiliary-danmaku-multiple-control +.article-holder .error-card .video-holder p { background-color: #333 !important; } diff --git a/registry/lib/components/style/dark-mode/old/dark-slice-4.css b/registry/lib/components/style/dark-mode/old/dark-slice-4.css index 21273524e..5d7be60e9 100644 --- a/registry/lib/components/style/dark-mode/old/dark-slice-4.css +++ b/registry/lib/components/style/dark-mode/old/dark-slice-4.css @@ -80,10 +80,6 @@ li.user-wrapper .avatar .detail .logout, { background-color: #222 !important; } -.player-auxiliary-area .bui-collapse -{ - background-color: #333 !important; -} .container .host-list-layout .hot-list-wrap .hot-song-list, .rank-list-container .rank-list-wrapper .rank-list, .rank-list-container .rank-list-wrapper, @@ -194,7 +190,6 @@ body #app .marquee, { background-color: #444 !important; } -.player-auxiliary-area .bui-collapse, .player-auxiliary-area .player-auxiliary-danmaku-btn-footer, .v-wrap #multi_page { diff --git a/registry/lib/components/style/dark-mode/old/dark-slice-6.css b/registry/lib/components/style/dark-mode/old/dark-slice-6.css index f245047d4..c3d7eab1f 100644 --- a/registry/lib/components/style/dark-mode/old/dark-slice-6.css +++ b/registry/lib/components/style/dark-mode/old/dark-slice-6.css @@ -167,7 +167,6 @@ .main-content .group .bp-input .content-box, .main-content .group .title .slot-right .bp-selector, .bp-input .content-box.textarea-box .textarea, -.edit-media-list .edit-mask .edit-board .edit-info .info-wrap .name-input, .play-list .rightside-content .source-list .source-item .collect, .play-list .leftside-content .oprate-panel .oprate-item .oprate-window, .edit-media-list .edit-mask .default-edit .default-edit-info .info-wrap .name-input, @@ -589,7 +588,6 @@ th.list-head-text, #page-fav .fav-sidenav .watch-later, .edit-media-list .edit-mask .edit-board .head, .edit-media-list .edit-mask .edit-board .edit-info .info-wrap .title, -.edit-media-list .edit-mask .edit-board .edit-info .info-wrap .name-input, .play-list .rightside-content .source-list .source-item .source-info .source-name, .play-list .leftside-content .list-title, .play-list .leftside-content .play-btn, @@ -759,7 +757,6 @@ th.list-head-text, #page-fav .fav-main .favList-info, #page-fav .fav-sidenav .watch-later, .edit-media-list .edit-mask .edit-board .head, -.edit-media-list .edit-mask .edit-board .edit-info .info-wrap .name-input, .play-list .rightside-content .source-list .source-item .collect, .play-list .rightside-content .source-list .source-item .collect .collect-item:first-child, .play-list .leftside-content .oprate-panel .oprate-item .oprate-window, diff --git a/registry/lib/components/style/dark-mode/old/dark-slice-8.css b/registry/lib/components/style/dark-mode/old/dark-slice-8.css index e2d2367c1..08bc7b460 100644 --- a/registry/lib/components/style/dark-mode/old/dark-slice-8.css +++ b/registry/lib/components/style/dark-mode/old/dark-slice-8.css @@ -30,13 +30,9 @@ } .at-popup .user-container .item.is-selected, .bangumi-options .opt-list, -.player-auxiliary-danmaku-function [class*="player-auxiliary-danmaku-btn-"], -.danmaku-wrap .player-auxiliary-area .player-auxiliary-danmaku-wrap, -.player-auxiliary-danmaku-function, .danmaku-wrap .player-auxiliary-area .player-auxiliary-danmaku-wrap-child .player-auxiliary-panel-title, .bpui-selected, .bpui-selected span, -.danmaku-wrap .player-auxiliary-block-wrap, .player-auxiliary-danmaku-wrap .player-auxiliary-danmaku-load-status, .comic-info-component .page-normal .comic-info-con .comic-des, .comic-info-component .page-normal .comic-info-con, From a84f15be738e4cebe65c4c8e340f453f76a8f9fa Mon Sep 17 00:00:00 2001 From: the1812 Date: Sat, 9 Jul 2022 14:39:41 +0800 Subject: [PATCH 04/24] Support for new player UI (#2615) --- .../components/utils/remove-promotions/remove-promotions.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/registry/lib/components/utils/remove-promotions/remove-promotions.scss b/registry/lib/components/utils/remove-promotions/remove-promotions.scss index ff6480d34..eb2534429 100644 --- a/registry/lib/components/utils/remove-promotions/remove-promotions.scss +++ b/registry/lib/components/utils/remove-promotions/remove-promotions.scss @@ -24,7 +24,9 @@ body.remove-game-match-module #reportFirst3, .eva-extension-area, .eva-banner, .video-ad-creative-card, -.bili-dyn-home--member .bili-dyn-ads { +.bili-dyn-home--member .bili-dyn-ads, +.video-page-special-card-small, +.video-page-operator-card-small { display: none !important; } .recommend-list .rec-list > :not(.video-page-card) + .video-page-card { From 8b43755e2f390627ac915fe1224b34bebc86d10b Mon Sep 17 00:00:00 2001 From: the1812 Date: Sat, 9 Jul 2022 15:27:56 +0800 Subject: [PATCH 05/24] Update dark styles (#2615) --- .../style/dark-mode/dark-slice-14.scss | 15 +++++++++++++ .../style/dark-mode/dark-slice-17.scss | 22 ++++++++++++++++++- .../style/dark-mode/old/dark-slice-2.css | 1 - .../style/dark-mode/old/dark-slice-8.css | 1 - 4 files changed, 36 insertions(+), 3 deletions(-) diff --git a/registry/lib/components/style/dark-mode/dark-slice-14.scss b/registry/lib/components/style/dark-mode/dark-slice-14.scss index d1030849b..603af415d 100644 --- a/registry/lib/components/style/dark-mode/dark-slice-14.scss +++ b/registry/lib/components/style/dark-mode/dark-slice-14.scss @@ -111,6 +111,14 @@ span:not(.cur-page) { @include color("e"); } + .cur-page { + @include color('a'); + } + } + &-right { + .next-button { + @include color('a'); + } } &-title { @include color("e"); @@ -121,6 +129,11 @@ } } &_second-line { + .second-line_left { + .abstract { + @include color('a'); + } + } .second-line_right { @include theme-border-color(); @include background-color("4"); @@ -156,8 +169,10 @@ &-title { @include color("e"); } + &-playing, &-title-playing { @include theme-color(); + @include background-color('5'); .cur-play-icon { @include to-theme("blue"); } diff --git a/registry/lib/components/style/dark-mode/dark-slice-17.scss b/registry/lib/components/style/dark-mode/dark-slice-17.scss index 01d274393..1c03f620f 100644 --- a/registry/lib/components/style/dark-mode/dark-slice-17.scss +++ b/registry/lib/components/style/dark-mode/dark-slice-17.scss @@ -1,4 +1,5 @@ @import './dark-definitions'; +@import 'common'; .video-info-v1 .video-data { @include color('a'); @@ -137,6 +138,9 @@ @include color('e'); } } +.base-video-sections-v1 { + @include background-color('4'); +} .video-page-special-card-small, .video-page-card-small { .pic-box { @@ -164,12 +168,15 @@ } } .bilibili-player-video-danmaku-input::-webkit-input-placeholder { - @include color('8'); + @include color('fff4'); } .bilibili-player-video-danmaku { &-setting, &-switch { @include fill('a'); + @include on-fullscreen { + @include fill('e'); + } &:hover { @include fill('e'); } @@ -569,6 +576,15 @@ } } +.player-auxiliary-filter-playlist { + .player-auxiliary-playlist-user { + @include color('a'); + } + .player-auxiliary-playlist-bottom { + @include border-color('6'); + } +} + .player-auxiliary-setting-menu-wrap { @include background-color('3'); @include border-color('8884'); @@ -595,6 +611,10 @@ } .player-auxiliary-danmaku-wrap { @include background-color(); + .player-auxiliary-danmaku-load-status { + @include background-color(); + @include color('a'); + } } .player-auxiliary-danmaku-function { @include background-color(); diff --git a/registry/lib/components/style/dark-mode/old/dark-slice-2.css b/registry/lib/components/style/dark-mode/old/dark-slice-2.css index 4d542c9c3..851871390 100644 --- a/registry/lib/components/style/dark-mode/old/dark-slice-2.css +++ b/registry/lib/components/style/dark-mode/old/dark-slice-2.css @@ -340,7 +340,6 @@ a.bp_box_bot_click, .player-auxiliary-danmaku-function [class*=player-auxiliary-danmaku-btn-], .player-auxiliary-danmaku-date-picker-header .player-auxiliary-danmaku-date-picker-btn, .player-auxiliary-danmaku-date-picker-header, -.player-auxiliary-danmaku-load-status.disabled, .player-auxiliary-block-list-function > div, .player-auxiliary-block-list-wrap .player-auxiliary-block-empty, .player-auxiliary-block-line.block-state-disabled, diff --git a/registry/lib/components/style/dark-mode/old/dark-slice-8.css b/registry/lib/components/style/dark-mode/old/dark-slice-8.css index 08bc7b460..b6af22b0e 100644 --- a/registry/lib/components/style/dark-mode/old/dark-slice-8.css +++ b/registry/lib/components/style/dark-mode/old/dark-slice-8.css @@ -33,7 +33,6 @@ .danmaku-wrap .player-auxiliary-area .player-auxiliary-danmaku-wrap-child .player-auxiliary-panel-title, .bpui-selected, .bpui-selected span, -.player-auxiliary-danmaku-wrap .player-auxiliary-danmaku-load-status, .comic-info-component .page-normal .comic-info-con .comic-des, .comic-info-component .page-normal .comic-info-con, .dropdown__content .dropdown__item:hover, From b02daaf6baa04239f674fba79ad567298131cbe1 Mon Sep 17 00:00:00 2001 From: the1812 Date: Sat, 9 Jul 2022 16:04:47 +0800 Subject: [PATCH 06/24] Support for new player UI (#2615) --- .../outer-watchlater/OuterWatchlater.vue | 26 +-- .../video/outer-watchlater/index.ts | 2 +- .../video/quick-favorite/QuickFavorite.vue | 151 ++++++++---------- .../components/video/quick-favorite/index.ts | 2 +- 4 files changed, 83 insertions(+), 98 deletions(-) diff --git a/registry/lib/components/video/outer-watchlater/OuterWatchlater.vue b/registry/lib/components/video/outer-watchlater/OuterWatchlater.vue index 8c8f0c703..76ed452d9 100644 --- a/registry/lib/components/video/outer-watchlater/OuterWatchlater.vue +++ b/registry/lib/components/video/outer-watchlater/OuterWatchlater.vue @@ -1,11 +1,6 @@