Merge pull request #89 from festoney8/dev

merge dev to main, v3.7.2
festoney8 · Jun 21, 2024 · b585db4 · b585db4
2 parents 8e94c41 + 3fb9693
commit b585db4
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 3.7.2
+
+-   新增：直播页 活动直播页自动跳转普通直播
+-   优化：播放页 网页全屏页面滚动
+-   更新：首页 隐藏banner，第一排按钮弹出菜单下置
+
 ## 3.7.1
 
 -   移除：顶栏右侧稍后再看相关功能，适配网页变动

diff --git a/src/rules/channel.ts b/src/rules/channel.ts
@@ -11,7 +11,8 @@ if (isPageChannel()) {
         new CheckboxItem({
             itemID: 'homepage-hide-banner',
             description: '隐藏 横幅banner',
-            itemCSS: `.header-banner__inner, .bili-header__banner {
+            itemCSS: `
+                .header-banner__inner, .bili-header__banner {
                     display: none !important;
                 }
                 .bili-header .bili-header__bar:not(.slide-down) {
@@ -43,7 +44,14 @@ if (isPageChannel()) {
                 }
                 /* header高度 */
                 #biliMainHeader {min-height: unset !important;}
-                `,
+                /* 分区菜单 第一排按钮的二级菜单下置  */
+                .v-popover.is-top {padding-top: 5px; padding-bottom: unset !important; bottom: unset !important;}
+                @media (min-width: 2200px) {.v-popover.is-top {top:32px;}}
+                @media (min-width: 1701px) and (max-width: 2199.9px) {.v-popover.is-top {top:32px;}}
+                @media (min-width: 1367px) and (max-width: 1700.9px) {.v-popover.is-top {top:28px;}}
+                @media (min-width: 1100px) and (max-width: 1366.9px) {.v-popover.is-top {top:28px;}}
+                @media (max-width: 1099.9px) {.v-popover.is-top {top:24px;}}
+            `,
         }),
         // 隐藏 全站分区栏
         new CheckboxItem({

diff --git a/src/rules/homepage.ts b/src/rules/homepage.ts
@@ -41,7 +41,15 @@ if (isPageHomepage()) {
                 }
                 #i_cecream .bili-header__bar:not(.slide-down) {
                     transition: background-color 0.3s ease-out !important;
-                }`,
+                }
+                /* 分区菜单 第一排按钮的二级菜单下置  */
+                .v-popover.is-top {padding-top: 5px; padding-bottom: unset !important; bottom: unset !important;}
+                @media (min-width: 2200px) {.v-popover.is-top {top:32px;}}
+                @media (min-width: 1701px) and (max-width: 2199.9px) {.v-popover.is-top {top:32px;}}
+                @media (min-width: 1367px) and (max-width: 1700.9px) {.v-popover.is-top {top:28px;}}
+                @media (min-width: 1100px) and (max-width: 1366.9px) {.v-popover.is-top {top:28px;}}
+                @media (max-width: 1099.9px) {.v-popover.is-top {top:24px;}}
+            `,
         }),
         // 隐藏 大图活动轮播, 默认开启
         new CheckboxItem({

diff --git a/src/rules/live.ts b/src/rules/live.ts
@@ -124,6 +124,24 @@ if (isPageLiveRoom()) {
             }
             `,
         }),
+        // 活动直播页 自动跳转普通直播
+        new CheckboxItem({
+            itemID: 'activity-live-auto-jump',
+            description: '活动直播页 自动跳转普通直播 (实验功能)',
+            itemFunc: () => {
+                const jump = () => {
+                    if (document.querySelector('#internationalHeader')) {
+                        if (!location.href.includes('/blanc/')) {
+                            window.location.href = location.href.replace(
+                                'live.bilibili.com/',
+                                'live.bilibili.com/blanc/',
+                            )
+                        }
+                    }
+                }
+                document.readyState === 'complete' ? jump() : document.addEventListener('DOMContentLoaded', jump)
+            },
+        }),
     ]
     liveGroupList.push(new Group('live-basic', '直播页 基本功能', basicItems))
 

diff --git a/src/rules/video.ts b/src/rules/video.ts
@@ -245,6 +245,11 @@ if (isPageVideo() || isPagePlaylist()) {
                 .webscreen-fix :is(.right-container, .playlist-container--right) {
                     padding-top: 100vh;
                 }
+                /* 隐藏小窗 */
+                .webscreen-fix .float-nav-exp .nav-menu .item.mini,
+                .webscreen-fix .fixed-sidenav-storage .mini-player-window {
+                    display: none !important;
+                }
                 /* 滚动条 */
                 .webscreen-fix::-webkit-scrollbar {
                     display: none !important;

diff --git a/vite.config.ts b/vite.config.ts
@@ -8,7 +8,7 @@ export default defineConfig({
             userscript: {
                 name: 'bilibili 页面净化大师',
                 namespace: 'http://tampermonkey.net/',
-                version: '3.7.1',
+                version: '3.7.2',
                 description:
                     '净化 B站/哔哩哔哩 页面，支持「精简功能、播放器净化、过滤视频、过滤评论、全站黑白名单」，提供 300+ 功能，定制自己的 B 站',
                 author: 'festoney8',