diff --git a/src/contentScripts/index.ts b/src/contentScripts/index.ts index 0d95f7dc..d5dd9f6b 100644 --- a/src/contentScripts/index.ts +++ b/src/contentScripts/index.ts @@ -65,6 +65,8 @@ function injectApp() { || /https?:\/\/t.bilibili.com\.*/.test(currentUrl) // history page || /https?:\/\/(www.)?bilibili.com\/account\/history.*/.test(currentUrl) + // user space page + || /https?:\/\/space.bilibili.com\.*/.test(currentUrl) ) { if ( /https?:\/\/bilibili.com\/?$/.test(currentUrl) diff --git a/src/manifest.ts b/src/manifest.ts index 2aece28c..b01fa459 100644 --- a/src/manifest.ts +++ b/src/manifest.ts @@ -39,7 +39,7 @@ export async function getManifest() { host_permissions: ['*://*.bilibili.com/*', '*://*.mcbbs.net/*'], content_scripts: [ { - matches: ['*://www.bilibili.com/*', '*://search.bilibili.com/*', '*://t.bilibili.com/*'], + matches: ['*://www.bilibili.com/*', '*://search.bilibili.com/*', '*://t.bilibili.com/*', '*://space.bilibili.com/*'], js: ['./dist/contentScripts/index.global.js'], run_at: 'document_start', match_about_blank: true, diff --git a/src/styles/adaptedStyles/comments.scss b/src/styles/adaptedStyles/comments.scss index 096b059b..b0159f51 100644 --- a/src/styles/adaptedStyles/comments.scss +++ b/src/styles/adaptedStyles/comments.scss @@ -50,3 +50,53 @@ drop-shadow(0 0 4px var(--bew-theme-color)); } // } + +// #region Old comments components +.bb-comment .comment-send .comment-submit, +.comment-bilibili-fold .comment-send .comment-submit, +.bb-comment .comment-send-lite .comment-submit, +.comment-bilibili-fold .comment-send-lite .comment-submit { + background-color: var(--bew-theme-color); + border-color: var(--bew-theme-color); +} + +.bb-comment, +.comment-bilibili-fold { + background-color: transparent; +} + +.bb-comment .comment-list .list-item .user .name, +.comment-bilibili-fold .comment-list .list-item .user .name, +.bb-comment .comment-header .tabs-order li, +.comment-bilibili-fold .comment-header .tabs-order li { + color: var(--bew-text-1); +} + +.bb-comment .comment-header .tabs-order li.on, +.comment-bilibili-fold .comment-header .tabs-order li.on { + border-color: var(--bew-theme-color); + color: var(--bew-theme-color); +} + +.bb-comment .comment-header .tabs-order li:hover, +.comment-bilibili-fold .comment-header .tabs-order li:hover { + color: var(--bew-theme-color); +} + +.bb-comment .comment-header, +.comment-bilibili-fold .comment-header, +.bb-comment .comment-list .list-item .con, +.comment-bilibili-fold .comment-list .list-item .con, +.bb-comment .comment-send .comment-emoji, +.comment-bilibili-fold .comment-send .comment-emoji, +.bb-comment .comment-send-lite .comment-emoji, +.comment-bilibili-fold .comment-send-lite .comment-emoji, +.bb-comment .bottom-page.center { + border-color: var(--bew-border-color); +} + +.bb-comment .comment-list .list-item .info .like.liked i, +.comment-bilibili-fold .comment-list .list-item .info .like.liked i { + filter: var(--bew-filter-icon-glow); +} +// #endregion diff --git a/src/styles/adaptedStyles/footer.scss b/src/styles/adaptedStyles/footer.scss new file mode 100644 index 00000000..08331622 --- /dev/null +++ b/src/styles/adaptedStyles/footer.scss @@ -0,0 +1,15 @@ +.bili-footer { + color: var(--bew-text-2); + + .footer-wrp { + background-color: var(--bew-content-solid-1); + } + + a { + color: var(--bew-text-1); + } + + .boston-postcards li { + border-color: var(--bew-border-color); + } +} diff --git a/src/styles/adaptedStyles/historyPage.scss b/src/styles/adaptedStyles/historyPage.scss index e69de29b..e7331a23 100644 --- a/src/styles/adaptedStyles/historyPage.scss +++ b/src/styles/adaptedStyles/historyPage.scss @@ -0,0 +1,112 @@ +.history-wrap .b-head .b-head-t { + color: var(--bew-text-1); +} + +.b-head-search { + border-color: var(--bew-border-color) !important; + color: var(--bew-text-1); + + &.input-active { + border-color: var(--bew-theme-color) !important; + } + + .b-head-search_input { + background-color: unset; + } + + .search-icon > img, + .search-cancel > img { + filter: var(--bew-filter-icon-glow); + } +} + +.history-wrap a.btn { + color: var(--bew-theme-color); +} + +.history-wrap .history-btn .btn:hover { + background-color: var(--bew-theme-color); + border-color: var(--bew-theme-color); +} + +.history-wrap .active { + background-color: var(--bew-theme-color); +} + +.history-wrap .active:before { + border-left-color: var(--bew-theme-color); +} + +.history-list .l-info { + border-right-color: var(--bew-fill-2); +} + +.history-list .l-info .lastplay-time .history-red-round { + border-left-color: var(--bew-fill-2); +} + +.history-wrap .time-label { + border-color: var(--bew-theme-color) !important; + color: white; +} +.history-wrap .time-label:after { + border-left-color: var(--bew-theme-color); +} +.history-wrap .time-label:before { + border-left-color: var(--bew-bg); +} +.history-wrap .time-label.active:before { + border-left-color: var(--bew-theme-color); +} + +.history-list .cover-contain .progress { + background-color: var(--bew-theme-color); +} + +.history-list .r-info { + background-color: unset; +} + +.history-list .r-info .r-txt { + border-color: var(--bew-border-color); +} + +.history-list .r-info .title { + color: var(--bew-text-1); +} + +.history-list .r-info .title:hover { + color: var(--bew-theme-color); +} + +.history-list .r-info .w-info .device, +.history-list .r-info .w-info .pro-txt, +.history-list .r-info .w-info .name { + color: var(--bew-text-3); +} + +.history-list .r-info .w-info .name { + border-left-color: var(--bew-border-color); +} + +.history-list .r-info .w-info .username { + color: var(--bew-text-2); +} + +.history-list .r-info .w-info .username:hover { + color: var(--bew-theme-color); +} + +.history-list .r-info .history-mark { + border-color: var(--bew-border-color); +} + +.go-top-m .go-top { + background-color: var(--bew-content-solid-1) !important; + border-color: var(--bew-border-color) !important; + + &:hover { + background-color: var(--bew-theme-color) !important; + border-color: var(--bew-theme-color) !important; + } +} diff --git a/src/styles/adaptedStyles/index.ts b/src/styles/adaptedStyles/index.ts index cb72f713..6a7665d4 100644 --- a/src/styles/adaptedStyles/index.ts +++ b/src/styles/adaptedStyles/index.ts @@ -1,4 +1,7 @@ import './comments.scss' +import './footer.scss' import './searchPage.scss' import './videoPage.scss' import './momentsPage.scss' +import './historyPage.scss' +import './userSpacePage.scss' diff --git a/src/styles/adaptedStyles/momentsPage.scss b/src/styles/adaptedStyles/momentsPage.scss index 5de7c018..35f47b4f 100644 --- a/src/styles/adaptedStyles/momentsPage.scss +++ b/src/styles/adaptedStyles/momentsPage.scss @@ -4,6 +4,7 @@ #app .bg { z-index: unset; + background-size: cover; } .bili-dyn-home--member { @@ -20,11 +21,176 @@ aside section.sticky { top: 80px; } + +.bili-dyn-my-info, +.bili-dyn-my-info--skeleton, +.bili-dyn-publishing, +.bili-dyn-up-list, +.bili-dyn-list-tabs, +.bili-dyn-item, +.bili-dyn-banner, +.topic-panel, +.bili-rich-textarea__inner, +.bili-dyn-live-users, +.bili-dyn-live-users__title, +.bili-dyn-list-loading { + background-color: var(--bew-content-solid-1); + color: var(--bew-text-1); +} + +.bili-dyn-my-info__stat__item__count, +.bili-rich-text__content, +.topic-panel__nav-title, +.relevant-topic__title, +.dyn-goods__one__detail__name, +.dyn-ugc__detail__title, +.dyn-reserve__title, +.bili-dyn-live-users__item__uname, +.dyn-additional-common__detail__title, +.bili-dyn-interaction__item__desc .bili-rich-text-module, +.bili-album__watch__control__option { + color: var(--bew-text-1); +} + +.bili-dyn-up-list__item__name { + color: var(--bew-text-2); +} + +.bili-dyn-my-info__stat__item:hover > div:first-child, +.bili-dyn-up-list__item.active .bili-dyn-up-list__item__name, +.bili-dyn-list-tabs__item.active, +.bili-dyn-list-tabs__item:hover, +.relevant-topic:hover .relevant-topic__title, +.bili-rich-text-link, +.bili-rich-text-module, +.bili-rich-text-topic, +.bili-dyn-card-video:hover .bili-dyn-card-video__title, +.bili-dyn-topic__text, +.bili-dyn-topic__icon, +.bili-rich-text__action, +.bili-dyn-action:not(.disabled).active, +.bili-dyn-action:not(.disabled):hover, +.dyn-goods__one__detail__price span, +.dyn-orig-author__name, +.dyn-reserve__desc__first.highlight, +.dyn-reserve__lottery__text, +.bili-album__watch__control__option:hover, +.bili-gallery__pagination__index { + color: var(--bew-theme-color); +} + +.bili-dyn-card-video__desc { + color: var(--bew-text-2); +} + +.bili-dyn-action:not(.disabled).active i, +.bili-dyn-action:not(.disabled):hover i, +.relevant-topic:before, +.bili-rich-text-module.lottery:before, +.bili-rich-text-link:before, +.bili-rich-text-module.goods.icon--taobao:before, +.dyn-reserve__lottery__icon, +.bili-album__watch__control__option:hover i { + filter: var(--bew-filter-icon-glow); +} + +.bili-dyn-topic__card:hover, +.bili-rich-text-link:hover, +.bili-rich-text-module:hover, +.bili-rich-text-topic:hover { + background-color: var(--bew-fill-2); +} + +.bili-topic-search__popover { + background-color: var(--bew-fill-1); + border-color: var(--bew-border-color); +} + +.dyn-goods__wrap, +.dyn-reserve__card, +.dyn-additional-common__wrap, +.bili-dyn-content__orig.reference, +.dyn-ugc__wrap { + background-color: var(--bew-fill-1); + color: var(--bew-text-1); +} + +.reference .dyn-goods__wrap, +.reference .dyn-reserve__card, +.reference .dyn-additional-common__wrap, +.reference .bili-dyn-content__orig.reference, +.reference .dyn-ugc__wrap { + background-color: var(--bew-content-solid-1); + color: var(--bew-text-1); +} + +.dyn-reserve__lottery__text:after, +.bili-album__watch__track__activeitemborder { + border-color: var(--bew-theme-color); +} + +.bili-topic-search__input__prefix, +.bili-topic-search__input__text { + color: var(--bew-text-2); +} + +.bili-dyn-publishing__hint:after { + color: var(--bew-border-color); +} + +.bili-dyn-publishing__action, +.dyn-goods__one__action button, +.dyn-reserve__action button, +.dyn-additional-common__action button { + background-color: var(--bew-theme-color); +} + +.dyn-orig-author__following { + border-color: var(--bew-theme-color); + color: var(--bew-theme-color); +} + +.bili-dyn-up-list__item.active .bili-dyn-up-list__item__face { + box-shadow: 0 0 0 2px var(--bew-theme-color); +} + +.bili-dyn-up-list__item__face { + background-color: var(--bew-fill-1); +} + +.bili-dyn-list-tabs__highlight { + background-color: var(--bew-theme-color); +} + +.bili-dyn-title__text { + color: var(--bew-text-1) !important; +} + +.bili-dyn-card-video { + border-color: var(--bew-border-color); +} +.bili-dyn-card-video__body { + background-color: var(--bew-content-solid-1); +} + +.bili-dyn-card-video__title { + color: var(--bew-text-1); +} + +.bili-album__watch__control { + background-color: var(--bew-fill-1); +} + +.bili-dyn-version-control__btn { + background-color: var(--bew-content-solid-1); + border-color: var(--bew-border-color); + color: var(--bew-text-1); +} + // #endregion .dyn-orig-author__following.following-icon:before { - filter: saturate(0) brightness(2) drop-shadow(0 0 1px var(--bew-theme-color)) - drop-shadow(0 0 4px var(--bew-theme-color)); + filter: var(--bew-filter-icon-glow); } #app .bg { diff --git a/src/styles/adaptedStyles/userSpacePage.scss b/src/styles/adaptedStyles/userSpacePage.scss new file mode 100644 index 00000000..afe1cd26 --- /dev/null +++ b/src/styles/adaptedStyles/userSpacePage.scss @@ -0,0 +1,18 @@ +#app { + &.owner, + &.fans, + &.visitor { + margin-top: 15px; + } +} + +.n .n-inner, +#page-index .col-1, +#page-index .col-2 .section, +#page-dynamic .col-2 .section { + background-color: var(--bew-content-solid-1); + // border-color: var(--bew-border-color); + border: none; + box-shadow: 0 0 0 1px var(--bew-border-color); + color: var(--bew-text-1); +} diff --git a/src/styles/adaptedStyles/videoPage.scss b/src/styles/adaptedStyles/videoPage.scss index e0aebdd5..a801a79f 100644 --- a/src/styles/adaptedStyles/videoPage.scss +++ b/src/styles/adaptedStyles/videoPage.scss @@ -30,8 +30,7 @@ .playing-gif, .multi-page-v1 .cur-list .list-box li.on img, .coin-operated-m-exp .like-checkbox input[type='checkbox']:checked + i { - filter: saturate(0) brightness(2) drop-shadow(0 0 1px var(--bew-theme-color)) - drop-shadow(0 0 4px var(--bew-theme-color)); + filter: var(--bew-filter-icon-glow); } .upinfo-btn-panel .follow-btn.not-follow:hover { diff --git a/src/styles/main.scss b/src/styles/main.scss index b474f363..00b8d754 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss @@ -35,7 +35,7 @@ body { font-size: 14px !important; min-width: unset !important; filter: none !important; - background-color: var(--bew-bg) !important; + background-color: var(--bew-bg); } .keep-two-lines { @@ -56,6 +56,14 @@ h6 { --at-apply: color-$bew-text-1; } +#bili-header-container { + background-color: var(--bew-bg) !important; +} + +.bili-header .bili-header__bar{ + visibility: hidden; +} + .card-loaded { background-color: var(--bew-elevated-solid-1); } diff --git a/src/styles/variables.scss b/src/styles/variables.scss index d900e1b1..cdba8374 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -109,9 +109,13 @@ --bew-fill-3: rgb(120 120 128 / 33%); --bew-fill-4: rgb(120 120 128 / 43%); - --bew-border-color: var(--bew-fill-1); + --bew-border-color: rgb(120 120 128 / 15%); --bew-page-max-width: 2000px; + + --bew-filter-icon-glow: saturate(0) brightness(2) + drop-shadow(0 0 1px var(--bew-theme-color)) + drop-shadow(0 0 4px var(--bew-theme-color)); } :host(.dark), @@ -144,6 +148,8 @@ --bew-fill-2: rgb(120 120 140 / 24%); --bew-fill-3: rgb(120 120 140 / 34%); --bew-fill-4: rgb(120 120 140 / 44%); + + --bew-border-color: rgb(120 120 140 / 24%); } // :root.dark {