Merge branch 'preview-fixes' into master-cdn

the1812 · Jul 30, 2024 · 07b5e5b · 07b5e5b
2 parents c6b077b + dffb95d
commit 07b5e5b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/registry/lib/components/style/special-danmaku/special-danmaku.scss b/registry/lib/components/style/special-danmaku/special-danmaku.scss
@@ -1,13 +1,17 @@
 body.disable-highlight-danmaku-style {
+  .bili-danmaku-x-high,
+  .bili-danmaku-x-high-top,
   .bili-dm.bili-high,
   .b-danmaku-high {
     display: block !important;
     padding: 0 !important;
     line-height: 1.125 !important;
+    .bili-danmaku-x-high-icon,
     .bili-high-icon,
     .b-danmaku-high-icon {
       display: none !important;
     }
+    .bili-danmaku-x-high-text,
     .bili-high-text,
     .b-danmaku-high-text {
       margin: 0 !important;
@@ -16,6 +20,7 @@ body.disable-highlight-danmaku-style {
   }
 }
 body.disable-up-danmaku-style {
+  .bili-danmaku-x-up,
   .bili-dm.bili-up,
   .b-danmaku-up {
     padding: 0 !important;
@@ -29,15 +34,17 @@ body.disable-up-danmaku-style {
   }
 }
 body.disable-vip-danmaku-style {
+  .bili-danmaku-x-dm-vip,
   .bili-dm-vip {
     display: contents !important;
     text-shadow: inherit !important;
   }
-  .bili-dm:not([style*='--textShadow']) {
+  :where(.bili-dm, .bili-danmaku-x-dm):not([style*='--textShadow']) {
     --textShadow: var(--danmaku-text-shadow);
   }
 }
 body.disable-upSlogan-danmaku-style {
+  .bili-danmaku-x-upslogan,
   .bili-upslogan {
     padding: 0 !important;
     opacity: var(--opacity) !important;

diff --git a/registry/lib/components/video/player/remove-popup/remove-popup.scss b/registry/lib/components/video/player/remove-popup/remove-popup.scss
@@ -1,11 +1,13 @@
 body {
   &.remove-player-popup {
     // https://www.bilibili.com/video/BV1WA4m1L7xa/
+    .bili-danmaku-x-cmd-shrink,
     .bili-cmd-shrink {
       display: none !important;
     }
-    // https://www.bilibili.com/video/BV1V54y1b7yW/
+    // https://www.bilibili.com/video/BV1V54y1b7yW/?t=58
     &-combo-likes {
+      .bili-danmaku-x-guide,
       .bili-guide,
       .bilibili-player-video-popup-three,
       .bilibili-player-video-popup-three-animate,
@@ -18,17 +20,19 @@ body {
         display: none !important;
       }
     }
-    // https://www.bilibili.com/video/BV11h411k72c/
+    // https://www.bilibili.com/video/BV11h411k72c/?t=90
     &-related-videos {
+      .bili-danmaku-x-link,
       .bili-link,
       .bilibili-player-video-link,
       .bilibili-player-link,
       .bpx-player-link {
         display: none !important;
       }
     }
-    // https://www.bilibili.com/video/BV12Y4y1L7SR/
+    // https://www.bilibili.com/video/BV12Y4y1L7SR/?t=230
     &-votes {
+      .bili-danmaku-x-vote,
       .bili-vote,
       .bilibili-player-video-popup-vote,
       .bpx-player-popup-dm-close,
@@ -37,8 +41,9 @@ body {
         display: none !important;
       }
     }
-    // https://www.bilibili.com/video/BV1V54y1b7yW/
+    // https://www.bilibili.com/video/BV1V54y1b7yW/?t=48
     &-rates {
+      .bili-danmaku-x-score,
       .bili-score,
       .bilibili-player-score,
       .bpx-player-popup-dm-close,
@@ -50,13 +55,15 @@ body {
     }
     // https://www.bilibili.com/video/BV1fe4y1b7NE/
     &-reservations {
+      .bili-danmaku-x-reserve,
       .bili-reserve,
       .bpx-player-reserve {
         display: none !important;
       }
     }
     // https://www.bilibili.com/video/BV1Qe411d7LM/?t=221
     &-promotions {
+      .bili-danmaku-x-cmtime,
       .bili-cmtime,
       .bpx-player-cmtime,
       .bpx-player-skipcard {