Merge pull request BewlyBewly#571 from hakadao/dev

Dev

.github/workflows/build.yml

@@ -54,11 +54,11 @@ jobs:
           name: BewlyBewly Zip
           path: extension
 
-      - name: Build Extension
+      - name: Build Extension-Firefox
         run: pnpm build-firefox
 
       - name: Upload Zip
         uses: actions/[email protected]
         with:
-          name: BewlyBewly Zip
+          name: BewlyBewly-Firefox Zip
           path: extension-firefox

src/components/Radio.vue

@@ -39,6 +39,10 @@ label {
   --b-border-width: 2px;
 }
 
+input[type="checkbox"] + span::after {
+  box-sizing: border-box;
+}
+
 input[type="checkbox"]{
 
   &:hover + span {

src/components/TopBar/components/MorePop.vue

@@ -7,7 +7,7 @@ const { t } = useI18n()
 const list = [
   { name: t('topbar.notifications'), url: '//message.bilibili.com' },
   { name: t('topbar.moments'), url: '//t.bilibili.com/' },
-  { name: t('topbar.favorites'), url: `//space.bilibili.com/${getUserID ?? ''}/favlist` },
+  { name: t('topbar.favorites'), url: `//space.bilibili.com/${getUserID() ?? ''}/favlist` },
   { name: t('topbar.history'), url: '//www.bilibili.com/account/history' },
   { name: t('topbar.watch_later'), url: '//www.bilibili.com/watchlater/#/list' },
   { name: t('topbar.creative_center'), url: '//member.bilibili.com/platform/home' },

src/contentScripts/views/Home/Home.vue

@@ -196,15 +196,15 @@ function toggleTabContentLoading(loading: boolean) {
 
       <header
         pos="sticky top-80px" w-full z-9 mb-9 duration-300
-        ease-in-out flex="~ justify-between items-center gap-4"
+        ease-in-out flex="~ justify-between items-start gap-4"
         :class="{ hide: shouldMoveTabsUp }"
       >
         <ul flex="~ items-center gap-3 wrap">
           <li
             v-for="tab in currentTabs" :key="tab.page"
             :class="{ 'tab-activated': activatedPage === tab.page }"
             style="backdrop-filter: var(--bew-filter-glass-1)"
-            px-4 lh-35px bg="$bew-elevated-1 hover:$bew-elevated-1-hover" rounded="$bew-radius"
+            px-4 lh-35px h-35px bg="$bew-elevated-1 hover:$bew-elevated-1-hover" rounded="$bew-radius"
             cursor-pointer shadow="$bew-shadow-1" box-border border="1 $bew-border-color" duration-300
             flex="~ gap-2 items-center"
             @click="handleChangeTab(tab)"
@@ -223,7 +223,7 @@ function toggleTabContentLoading(loading: boolean) {
 
         <div
           style="backdrop-filter: var(--bew-filter-glass-1)"
-          flex="~ gap-1" p-1 h-35px bg="$bew-elevated-1"
+          flex="~ gap-1 shrink-0" p-1 h-35px bg="$bew-elevated-1"
           rounded="$bew-radius" shadow="$bew-shadow-1" box-border border="1 $bew-border-color"
         >
           <Icon

src/styles/adaptedStyles/userCard.scss

@@ -1,5 +1,19 @@
 .bewly-design {
-  // old user card styles
+  // #region new user card styles
+
+  // #region theme color adaption part
+  .bili-user-profile-view__info__button.follow:hover {
+    background-color: var(--bew-theme-color-80);
+  }
+
+  .bili-user-profile-view__info__button.follow:hover {
+    border-color: var(--bew-theme-color-80);
+  }
+  // #endregion
+
+  // #endregion
+
+  // #region old user card styles
   &.dark {
     #id-card {
       background-color: var(--bew-elevated-solid-1);
@@ -45,4 +59,5 @@
       }
     }
   }
+  // #endregion
 }

src/styles/adaptedStyles/userSpacePage.scss

@@ -75,7 +75,9 @@
     .section-title .play-all-channel:hover,
     #page-index .col-1 .section .more:hover,
     #page-index .channel .section-right-options .play-all-channel:hover,
-    .section .operation:hover {
+    .section .operation:hover,
+    #page-video .play-all-btn:hover .video-commonplayer_play,
+    .i-live .i-live-fo-btn {
       color: var(--bew-theme-color);
     }
 
@@ -97,6 +99,10 @@
       color: var(--bew-theme-color) !important;
     }
 
+    .i-live .i-live-fo-btn:hover {
+      color: var(--bew-theme-color-80);
+    }
+
     .n .n-cursor,
     .be-tab-cursor,
     .bangumi-pagelistbox .p:hover,
@@ -107,7 +113,8 @@
     .be-input_inner:focus,
     #page-index #i-ann-content textarea:focus,
     #page-index #i-ann-content textarea:hover,
-    .btn.default {
+    .btn.default,
+    .i-live .i-live-fo-btn {
       border-color: var(--bew-theme-color);
     }
 
@@ -124,6 +131,10 @@
       border-color: var(--bew-theme-color) !important;
     }
 
+    .i-live .i-live-fo-btn:hover {
+      border-color: var(--bew-theme-color-80);
+    }
+
     .n .n-cursor,
     #pin-wrapper .pin-layer-vlist .small-item.selected,
     .be-switch-container.is-checked .be-switch,
@@ -137,12 +148,17 @@
     .favInfo-box .favInfo-details .fav-options .fav-play,
     .be-pager-item-active,
     .search-nav-item.search-nav-actived,
-    #page-series-detail .channel-option .modify-channel {
+    #page-series-detail .channel-option .modify-channel,
+    .game-card__btn,
+    .be-tags-container .tag.new-tag {
       background-color: var(--bew-theme-color);
     }
 
     .btn.primary:focus,
-    .btn.primary:hover {
+    .btn.primary:hover,
+    .h .h-follow:hover,
+    .game-card__btn:hover,
+    .favInfo-box .favInfo-details .fav-options .fav-play:hover {
       background-color: var(--bew-theme-color-80);
     }
 
@@ -177,7 +193,8 @@
       .clearfix:not(.filter-disable)
       .icon,
     .page-head .v-filter-line .style .icon.active,
-    .page-head .v-filter-line .style .icon:hover {
+    .page-head .v-filter-line .style .icon:hover,
+    .i-live .i-live-off-guest a .i-live-arrow {
       filter: var(--bew-filter-icon-glow);
     }
 

src/utils/main.ts

@@ -116,6 +116,8 @@ export function delay(ms: number) {
 export function isHomePage(): boolean {
   if (
     /https?:\/\/(www\.)bilibili.com\/?(#\/?)?$/.test(location.href)
+    // https://github.com/hakadao/BewlyBewly/issues/525 #525
+    || /https?:\/\/(www\.)bilibili.com(\/)?(\?.*)?$/.test(location.href)
     || /https?:\/\/(www\.)bilibili.com\/index\.html$/.test(location.href)
     || /https?:\/\/(www\.)?bilibili.com\/\?spm_id_from=(.)*/.test(location.href)
   )