diff --git a/registry/lib/components/style/custom-navbar/history/history.ts b/registry/lib/components/style/custom-navbar/history/history.ts index 23c0f0c91..e843f1be9 100644 --- a/registry/lib/components/style/custom-navbar/history/history.ts +++ b/registry/lib/components/style/custom-navbar/history/history.ts @@ -7,6 +7,7 @@ export const history: CustomNavbarItemInit = { content: '历史', href, + touch: true, active: document.URL.replace(/\?.*$/, '') === href, loginRequired: true, diff --git a/registry/lib/components/style/custom-navbar/search/NavbarSearch.vue b/registry/lib/components/style/custom-navbar/search/NavbarSearch.vue index 6e5705a8e..4866fc74d 100644 --- a/registry/lib/components/style/custom-navbar/search/NavbarSearch.vue +++ b/registry/lib/components/style/custom-navbar/search/NavbarSearch.vue @@ -17,7 +17,7 @@ export default Vue.extend({ // transparent mode / no fill .launch-bar { --color: var(--custom-navbar-foreground); - background-color: #0002; + background-color: #000A; opacity: 0.5; transition: opacity 0.2s ease-out; padding: 2px 6px; diff --git a/registry/lib/components/style/custom-navbar/transparent-fill.ts b/registry/lib/components/style/custom-navbar/transparent-fill.ts index c849ece2b..1bb64e50a 100644 --- a/registry/lib/components/style/custom-navbar/transparent-fill.ts +++ b/registry/lib/components/style/custom-navbar/transparent-fill.ts @@ -1,4 +1,3 @@ -import { attributes } from '@/core/observer' import { addComponentListener, getComponentSettings } from '@/core/settings' import { sq } from '@/core/spin-query' import { mainSiteUrls, matchCurrentPage } from '@/core/utils/urls' @@ -13,23 +12,35 @@ export const checkTransparentFill = async (vm: { return } sq( - () => dq('#banner_link,.international-header .bili-banner, .bili-header__banner'), - banner => (banner === null ? false : Boolean((banner as HTMLElement).style.backgroundImage)), - ).then((banner: HTMLElement) => { - if (!banner) { - return - } - attributes(banner, () => { - addComponentListener('customNavbar.transparent', value => { - if (!getComponentSettings('hideBanner').enabled) { - vm.toggleStyle(value, 'transparent') + () => dqa('.animated-banner video, .banner-img img, #banner_link, .international-header .bili-banner, .bili-header__banner'), + banners => { + if (banners.length === 0) { + return false + } + const hasBannerImage = (banner: HTMLElement) => { + if (banner.style.backgroundImage) { + return true } - }, true) - addComponentListener('hideBanner', value => { - if (getComponentSettings('customNavbar').options.transparent) { - vm.toggleStyle(!value, 'transparent') + if ((banner as HTMLVideoElement | HTMLImageElement).src) { + return true } - }) + return false + } + if (banners.some(hasBannerImage)) { + return true + } + return false + }, + ).then(() => { + addComponentListener('customNavbar.transparent', value => { + if (!getComponentSettings('hideBanner').enabled) { + vm.toggleStyle(value, 'transparent') + } + }, true) + addComponentListener('hideBanner', value => { + if (getComponentSettings('customNavbar').options.transparent) { + vm.toggleStyle(!value, 'transparent') + } }) }) } diff --git a/registry/lib/components/style/dark-mode/dark-slice-12.scss b/registry/lib/components/style/dark-mode/dark-slice-12.scss index ebe878168..4f6b70178 100644 --- a/registry/lib/components/style/dark-mode/dark-slice-12.scss +++ b/registry/lib/components/style/dark-mode/dark-slice-12.scss @@ -239,6 +239,7 @@ } } .s_tag .tag-area { + .tag, .tag-item { @include background-color("4"); @include border-color(); 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 12b96886d..00e5093d1 100644 --- a/registry/lib/components/style/dark-mode/dark-slice-14.scss +++ b/registry/lib/components/style/dark-mode/dark-slice-14.scss @@ -112,6 +112,12 @@ @include color("e"); } } + &-title { + @include color("e"); + &:hover { + @include theme-color(); + } + } } } &_second-line { 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 6a48b3472..c545fb634 100644 --- a/registry/lib/components/style/dark-mode/dark-slice-15.scss +++ b/registry/lib/components/style/dark-mode/dark-slice-15.scss @@ -1032,6 +1032,10 @@ $media-types: (video, bangumi, cheese, live, manga, movie, ogv, article); } } } + + .border-bottom-line { + @include background-color("6"); + } } .up-info { .u-face .u-face__avatar { @@ -1054,3 +1058,11 @@ $media-types: (video, bangumi, cheese, live, manga, movie, ogv, article); } } } +.user-card { + .info p { + @include color("e"); + } + .gray-text { + @include color("a"); + } +} diff --git a/registry/lib/components/style/simplify/live/live.scss b/registry/lib/components/style/simplify/live/live.scss index f931cb304..4612282b8 100644 --- a/registry/lib/components/style/simplify/live/live.scss +++ b/registry/lib/components/style/simplify/live/live.scss @@ -47,9 +47,23 @@ $prefix: "simplifyLiveroom-switch"; display: flex !important; padding: 10px 24px 10px 12px !important; height: auto !important; + + .blive-avatar-icons, .face-pendants { display: none !important; } + // .blive-avatar-icons { + // right: -2px !important; + // .blive-avatar-icon { + // width: 12px !important; + // height: 12px !important; + // border-width: 1px !important; + // } + // } + .blive-avatar-pendant { + width: 48px !important; + height: 48px !important; + } .blive-avatar-face, .blive-avatar, .avatar { diff --git a/registry/lib/components/utils/keymap/actions.ts b/registry/lib/components/utils/keymap/actions.ts index aae65b969..fe7a61870 100644 --- a/registry/lib/components/utils/keymap/actions.ts +++ b/registry/lib/components/utils/keymap/actions.ts @@ -112,7 +112,7 @@ export const builtInActions: Record = { if (lodash.isNil(result)) { return result } - if (result) { + if (playerAgent.isMute()) { showTip('已静音', 'mdi-volume-off') } else { showTip('已取消静音', 'mdi-volume-high') diff --git a/registry/lib/components/video/bvid-convert/BvidConvert.vue b/registry/lib/components/video/bvid-convert/BvidConvert.vue index 8d2804ac3..ec9615050 100644 --- a/registry/lib/components/video/bvid-convert/BvidConvert.vue +++ b/registry/lib/components/video/bvid-convert/BvidConvert.vue @@ -20,6 +20,8 @@