From e5df4d265b838b07331fc6199760e4799cba4208 Mon Sep 17 00:00:00 2001
From: festoney8 <festoney8@gmail.com>
Date: Mon, 21 Oct 2024 05:52:53 +0800
Subject: [PATCH] update: popular page 2 column style

---
 CHANGELOG.md                                       | 1 +
 src/modules/rules/bangumi/groups/danmakuControl.ts | 1 +
 src/modules/rules/bangumi/groups/player.scss       | 2 +-
 src/modules/rules/bangumi/groups/player.ts         | 2 +-
 src/modules/rules/popular/groups/layout.scss       | 2 +-
 src/modules/rules/popular/groups/layout.ts         | 4 ++--
 src/modules/rules/video/groups/danmakuControl.ts   | 1 +
 src/modules/rules/video/groups/player.scss         | 2 +-
 src/modules/rules/video/groups/player.ts           | 2 +-
 9 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a8c83c45..60c32b7c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 -   新增：稍后再看列表页 增大字号、修改列数、隐藏按钮
 -   新增：字幕样式 字重设定
 -   新增：弹幕样式 字体和字重设定
+-   优化：热门页 双列样式
 
 ## 4.0.3
 
diff --git a/src/modules/rules/bangumi/groups/danmakuControl.ts b/src/modules/rules/bangumi/groups/danmakuControl.ts
index 9cd5c043..004ffa46 100644
--- a/src/modules/rules/bangumi/groups/danmakuControl.ts
+++ b/src/modules/rules/bangumi/groups/danmakuControl.ts
@@ -47,6 +47,7 @@ export const bangumiDanmakuControlItems: Item[] = [
         type: 'switch',
         id: 'video-page-hide-bpx-player-sending-area',
         name: '非全屏下 关闭弹幕栏',
+        description: ['字母 D 是弹幕开关快捷键'],
     },
     {
         type: 'switch',
diff --git a/src/modules/rules/bangumi/groups/player.scss b/src/modules/rules/bangumi/groups/player.scss
index 93a4e49f..7e7b4a2f 100644
--- a/src/modules/rules/bangumi/groups/player.scss
+++ b/src/modules/rules/bangumi/groups/player.scss
@@ -1,4 +1,4 @@
-// 隐藏 播放器内标题
+// 隐藏 全屏下 播放器内标题
 html[video-page-hide-bpx-player-top-left-title] {
     .bpx-player-top-title {
         display: none !important;
diff --git a/src/modules/rules/bangumi/groups/player.ts b/src/modules/rules/bangumi/groups/player.ts
index a97e32f5..519ca98a 100644
--- a/src/modules/rules/bangumi/groups/player.ts
+++ b/src/modules/rules/bangumi/groups/player.ts
@@ -4,7 +4,7 @@ export const bangumiPlayerItems: Item[] = [
     {
         type: 'switch',
         id: 'video-page-hide-bpx-player-top-left-title',
-        name: '隐藏 播放器内标题',
+        name: '隐藏 全屏下 播放器内标题',
     },
     {
         type: 'switch',
diff --git a/src/modules/rules/popular/groups/layout.scss b/src/modules/rules/popular/groups/layout.scss
index 847227f9..9a3779fe 100644
--- a/src/modules/rules/popular/groups/layout.scss
+++ b/src/modules/rules/popular/groups/layout.scss
@@ -1,5 +1,5 @@
 // 官方默认 2 列布局
-html[popular-layout-default] {
+html[popular-layout-2-column] {
     .cm-module {
         display: none !important;
     }
diff --git a/src/modules/rules/popular/groups/layout.ts b/src/modules/rules/popular/groups/layout.ts
index a060ca66..3ee20b82 100644
--- a/src/modules/rules/popular/groups/layout.ts
+++ b/src/modules/rules/popular/groups/layout.ts
@@ -5,7 +5,7 @@ export const popularLayoutItems: Item[] = [
         type: 'list',
         id: 'popular-layout',
         name: '强制修改视频列数',
-        defaultValue: 'popular-layout-disable',
+        defaultValue: 'popular-layout-2-column',
         disableValue: 'popular-layout-disable',
         description: [
             '默认隐藏视频简介、标签',
@@ -14,7 +14,7 @@ export const popularLayoutItems: Item[] = [
         ],
         options: [
             {
-                id: 'popular-layout-disable',
+                id: 'popular-layout-2-column',
                 name: '未启用',
             },
             {
diff --git a/src/modules/rules/video/groups/danmakuControl.ts b/src/modules/rules/video/groups/danmakuControl.ts
index fc7da28a..911686ca 100644
--- a/src/modules/rules/video/groups/danmakuControl.ts
+++ b/src/modules/rules/video/groups/danmakuControl.ts
@@ -52,6 +52,7 @@ export const videoDanmakuControlItems: Item[] = [
         type: 'switch',
         id: 'video-page-hide-bpx-player-sending-area',
         name: '非全屏下 关闭弹幕栏',
+        description: ['字母 D 是弹幕开关快捷键'],
     },
     {
         type: 'switch',
diff --git a/src/modules/rules/video/groups/player.scss b/src/modules/rules/video/groups/player.scss
index ceb6662d..fd697eb3 100644
--- a/src/modules/rules/video/groups/player.scss
+++ b/src/modules/rules/video/groups/player.scss
@@ -98,7 +98,7 @@ html[video-page-hide-bpx-player-cmd-dm-wrap] {
     }
 }
 
-// 隐藏 播放器内标题
+// 隐藏 全屏下 播放器内标题
 html[video-page-hide-bpx-player-top-left-title] {
     .bpx-player-top-title {
         display: none !important;
diff --git a/src/modules/rules/video/groups/player.ts b/src/modules/rules/video/groups/player.ts
index 575a2801..de702ad4 100644
--- a/src/modules/rules/video/groups/player.ts
+++ b/src/modules/rules/video/groups/player.ts
@@ -60,7 +60,7 @@ export const videoPlayerItems: Item[] = [
     {
         type: 'switch',
         id: 'video-page-hide-bpx-player-top-left-title',
-        name: '隐藏 播放器内标题',
+        name: '隐藏 全屏下 播放器内标题',
     },
     {
         type: 'switch',