diff --git a/src/contentScripts/index.ts b/src/contentScripts/index.ts index 78347bfb..00517e1b 100644 --- a/src/contentScripts/index.ts +++ b/src/contentScripts/index.ts @@ -63,7 +63,8 @@ function isSupportedPages() { // channel page e.g. tv shows, movie, variety shows, mooc page || /https?:\/\/(?:www\.)?bilibili\.com\/(?:tv|movie|variety|mooc|documentary).*/.test(currentUrl) // article page - || /https?:\/\/(?:www\.)?bilibili\.com\/read.*/.test(currentUrl) + // www.bilibili.com/read/pcpreview 是专栏浏览页, 因布局问题不做适配 #846 + || /https?:\/\/(?:www\.)?bilibili\.com\/read\/(?!pcpreview).*/.test(currentUrl) // 404 page || /^https?:\/\/(?:www\.)?bilibili\.com\/404.*$/.test(currentUrl) ) { diff --git a/src/styles/adaptedStyles/articlesPage.scss b/src/styles/adaptedStyles/articlesPage.scss index 37627d55..803dcf17 100644 --- a/src/styles/adaptedStyles/articlesPage.scss +++ b/src/styles/adaptedStyles/articlesPage.scss @@ -36,7 +36,6 @@ .video-link__to, .interaction-info .hover-item:hover, .interaction-info .hover-item:hover i, - .normal-article-holder a, .read-article-holder .card-text-label, .share-dynamic-dialog .sdd-card .name, .bili-dialog-bomb .appeal-box .wrap .container .textarea .memo a, @@ -62,7 +61,9 @@ .article-content .article-left-block .article-info-bar - .reply:hover { + .reply:hover, + .article-up-info .nameplate-ctnr .info .info-bottom a, + .article-up-info .nameplate-ctnr .info .info-bottom a:hover { color: var(--bew-theme-color); } @@ -78,7 +79,8 @@ .error-container .error-panel .rollback-btn, .error-container .error-manga .change-img-btn, .list-container .list-info-block .right-side .up-info-block .follow-btn:not(.on), - .modalBox .sure { + .modalBox .sure, + .promote-hint { background-color: var(--bew-theme-color); } @@ -158,7 +160,10 @@ .list-container .list-info-block .right-side .up-info-block .up-name, .list-container .article-list-block .article-item .item-holder .article-content .article-title, .modalBox, - .modalBox .cancel { + .modalBox .cancel, + .normal-article-holder .color-default, + .normal-article-holder h1, + .article-up-info .nameplate-ctnr .info { color: var(--bew-text-1); } @@ -191,7 +196,8 @@ #App .rank-module .tips, .list-container .list-info-block .right-side .col, .list-container .list-info-block .right-side .summary, - .list-container .list-info-block .right-side .up-info-block .follow-btn.on { + .list-container .list-info-block .right-side .up-info-block .follow-btn.on, + .article-up-info .nameplate-ctnr .info .n-type { color: var(--bew-text-2); } @@ -316,7 +322,8 @@ .page-content .left-side .partitio-name .filter .filter-btn-lst, .to-top, .bili-dialog-bomb .appeal-box, - .modalBox { + .modalBox, + .article-up-info .nameplate-ctnr { background-color: var(--bew-elevated-solid-1); } @@ -381,7 +388,9 @@ .list-container .list-info-block .right-side .col .split-line, .list-container .list-info-block .right-side .up-info-block .follow-btn.on, .list-container .article-list-block .article-item .item-holder .article-content .article-left-block, - .modalBox .cancel { + .modalBox .cancel, + .article-up-info .nameplate-ctnr, + .article-up-info .nameplate-ctnr .info { border-color: var(--bew-border-color); } @@ -390,6 +399,10 @@ border-color: var(--bew-elevated-solid-1); } + .rql-editor .ql-editor blockquote { + border-color: var(--bew-text-4); + } + .nav-tab-bar .tab-item:before { filter: invert(1) hue-rotate(180deg); } diff --git a/src/styles/adaptedStyles/index.ts b/src/styles/adaptedStyles/index.ts index ba85c699..f83675ee 100644 --- a/src/styles/adaptedStyles/index.ts +++ b/src/styles/adaptedStyles/index.ts @@ -24,11 +24,11 @@ async function setupStyles() { document.documentElement.classList.add('notificationsPage') } - // moments page 动态页 + // moments page, new articles page 动态页, 新版专栏页 else if ( // moments /https?:\/\/t\.bilibili\.com\.*/.test(currentUrl) - // moment detail + // moment detail, new articles page || /https?:\/\/www\.bilibili\.com\/opus\/.*/.test(currentUrl)) { await import('./momentsPage.scss') document.documentElement.classList.add('momentsPage') @@ -91,14 +91,14 @@ async function setupStyles() { document.documentElement.classList.add('animePage') } - // channel page e.g. tv shows, movie, variety shows, mooc page 分区页 + // channel page e.g. tv shows, movie, variety shows & mooc pages 分区页 else if ( /https?:\/\/(?:www\.)?bilibili\.com\/(?:tv|movie|variety|mooc|documentary).*/.test(currentUrl)) { await import('./channelPage.scss') document.documentElement.classList.add('channelPage') } - // articles page 专栏页 + // articles, articles list & articles ranking pages 专栏页, 专栏列表页, 专栏排行榜页 else if (/https?:\/\/(?:www\.)?bilibili\.com\/read.*/.test(currentUrl)) { await import('./articlesPage.scss') document.documentElement.classList.add('articlesPage') diff --git a/src/styles/adaptedStyles/momentsPage.scss b/src/styles/adaptedStyles/momentsPage.scss index 7a69c9b4..9be45179 100644 --- a/src/styles/adaptedStyles/momentsPage.scss +++ b/src/styles/adaptedStyles/momentsPage.scss @@ -114,6 +114,14 @@ .bili-set-follow-group__list.is-disabled:after { background-color: transparent; } + + .opus-module-content blockquote:before { + background-color: var(--bew-text-4); + } + + .qrcode-box__content { + box-shadow: 0 0 0 5px white; + } } // #endregion diff --git a/src/styles/adaptedStyles/userSpacePage.scss b/src/styles/adaptedStyles/userSpacePage.scss index 5ca379b9..4d4692ac 100644 --- a/src/styles/adaptedStyles/userSpacePage.scss +++ b/src/styles/adaptedStyles/userSpacePage.scss @@ -578,7 +578,8 @@ .feed-dynamic-header-search, .section .count, .list-create .text, - .btn-container .btn { + .btn-container .btn, + .user-info .info-content .info-tags .info-tag .tag-content { color: var(--bew-text-2); } diff --git a/src/styles/adaptedStyles/videoPage.scss b/src/styles/adaptedStyles/videoPage.scss index 20dfbbd0..ef847724 100644 --- a/src/styles/adaptedStyles/videoPage.scss +++ b/src/styles/adaptedStyles/videoPage.scss @@ -296,7 +296,8 @@ .note-list .note-card-container .note-card .user-info .user-name, .note-up .up-desc-container .desc-bottom, - .note-detail .note-operation .tab-action-item .tab-action-icon .tab-num { + .note-detail .note-operation .tab-action-item .tab-action-icon .tab-num, + .reply-item .root-reply-container .content-warp .vote-info__text { color: var(--bew-text-2); }