Merge branch 'BewlyBewly:dev' into dev

MengNianxiaoyao · May 3, 2024 · fca0ac5 · fca0ac5
2 parents 0d83fa4 + ccecdc7
commit fca0ac5
Show file tree

Hide file tree

Showing 3 changed files with 93 additions and 95 deletions.
diff --git a/src/auto-imports.d.ts b/src/auto-imports.d.ts
@@ -42,7 +42,6 @@ declare global {
   const readonly: typeof import('vue')['readonly']
   const ref: typeof import('vue')['ref']
   const resolveComponent: typeof import('vue')['resolveComponent']
-  const resolveDirective: typeof import('vue')['resolveDirective']
   const searchBarCharacters: typeof import('./composables/useImage')['searchBarCharacters']
   const shallowReactive: typeof import('vue')['shallowReactive']
   const shallowReadonly: typeof import('vue')['shallowReadonly']

diff --git a/src/contentScripts/views/App.vue b/src/contentScripts/views/App.vue
@@ -378,4 +378,8 @@ provide<BewlyAppProvider>('BEWLY_APP', {
 .top-bar-leave-to {
   --at-apply: opacity-0 transform -translate-y-full;
 }
+
+.bewly-wrapper {
+  --at-apply: text-size-$bew-base-font-size;
+}
 </style>
diff --git a/src/styles/adaptedStyles/historyPage.scss b/src/styles/adaptedStyles/historyPage.scss
@@ -1,124 +1,119 @@
 .bewly-design.historyPage {
-  .history-wrap .b-head .b-head-t,
-  .history-wrap .warn .txt {
-    color: var(--bew-text-1);
-  }
 
-  .b-head-search {
-    border-color: var(--bew-border-color) !important;
-    color: var(--bew-text-1);
+  // #region theme color adaption part
+  // Increase the priority of the style inside by writing a non-existent selector in `:not()`
+  :not(fdjslfds) {
 
-    &.input-active {
-      border-color: var(--bew-theme-color) !important;
+    .history-list .r-info .w-info .username:hover,
+    .history-wrap a.btn {
+      color: var(--bew-theme-color);
     }
 
-    .b-head-search_input {
-      background-color: unset;
+    .history-wrap .warn .btn,
+    .history-wrap .time-label.active,
+    .history-wrap a.btn:hover {
+      color: white;
     }
 
-    .search-icon > img,
-    .search-cancel > img {
-      filter: var(--bew-filter-icon-glow);
+    .history-wrap a.btn,
+    .history-wrap .time-label,
+    .history-list .r-info .title:hover {
+      color: var(--bew-theme-color);
     }
-  }
-
-  .history-wrap a.btn:hover,
-  .history-wrap .active {
-    background-color: var(--bew-theme-color);
-  }
 
-  .history-wrap .warn .btn {
-    background-color: var(--bew-theme-color);
-    color: white;
-  }
+    .history-wrap .active,
+    .history-wrap .history-btn .btn:hover,
+    .history-wrap a.btn:hover,
+    .history-wrap .active,
+    .history-wrap .warn .btn,
+    .history-list .cover-contain .progress {
+      background-color: var(--bew-theme-color);
+    }
 
-  .history-wrap .history-btn .btn:hover {
-    background-color: var(--bew-theme-color);
-    border-color: var(--bew-theme-color);
-  }
+    .go-top-m .go-top:hover {
+      background-color: var(--bew-theme-color) !important;
+    }
 
-  .history-wrap .active:before {
-    border-left-color: var(--bew-theme-color);
-  }
+    .history-wrap .active:before,
+    .history-wrap .time-label:after,
+    .history-wrap .time-label.active:before {
+      border-left-color: var(--bew-theme-color);
+    }
 
-  .history-list .l-info {
-    border-right-color: var(--bew-fill-2);
-  }
+    .history-wrap .history-btn .btn:hover {
+      border-color: var(--bew-theme-color);
+    }
 
-  .history-list .l-info .lastplay-time .history-red-round {
-    border-left-color: var(--bew-fill-2);
-  }
+    .b-head-search.input-active,
+    .history-wrap a.btn,
+    .history-wrap .time-label,
+    .history-wrap .time-label.active,
+    .history-wrap a.btn:hover,
+    .go-top-m .go-top:hover {
+      border-color: var(--bew-theme-color) !important;
+    }
 
-  .history-wrap .time-label.active,
-  .history-wrap a.btn:hover {
-    border-color: var(--bew-theme-color) !important;
-    color: white;
+    .b-head-search .search-icon>img,
+    .b-head-search .search-cancel>img {
+      filter: var(--bew-filter-icon-glow);
+    }
   }
 
-  .history-wrap a.btn,
-  .history-wrap .time-label {
-    border-color: var(--bew-theme-color) !important;
-    color: var(--bew-theme-color);
-  }
-  .history-wrap .time-label:after {
-    border-left-color: var(--bew-theme-color);
-  }
-  .history-wrap .time-label:before {
-    border-left-color: var(--bew-bg);
-  }
-  .history-wrap .time-label.active:before {
-    border-left-color: var(--bew-theme-color);
-  }
+  // #endregion
 
-  .history-list .cover-contain .progress {
-    background-color: var(--bew-theme-color);
-  }
+  // #region dark mode adaption part
+  &.dark {
 
-  .history-list .r-info {
-    background-color: unset;
-  }
+    .history-wrap .warn .txt,
+    .history-wrap .b-head .b-head-t,
+    .b-head-search,
+    .history-list .r-info .title {
+      color: var(--bew-text-1);
+    }
 
-  .history-list .r-info .r-txt {
-    border-color: var(--bew-border-color);
-  }
+    .history-list .r-info .w-info .username {
+      color: var(--bew-text-2);
+    }
 
-  .history-list .r-info .title {
-    color: var(--bew-text-1);
-  }
+    .history-list .r-info .w-info .device,
+    .history-list .r-info .w-info .pro-txt,
+    .history-list .r-info .w-info .name {
+      color: var(--bew-text-3);
+    }
 
-  .history-list .r-info .title:hover {
-    color: var(--bew-theme-color);
-  }
+    .history-list .r-info .history-mark,
+    .history-list .r-info .r-txt {
+      border-color: var(--bew-border-color);
+    }
 
-  .history-list .r-info .w-info .device,
-  .history-list .r-info .w-info .pro-txt,
-  .history-list .r-info .w-info .name {
-    color: var(--bew-text-3);
-  }
+    .go-top-m .go-top,
+    .b-head-search {
+      border-color: var(--bew-border-color) !important;
+    }
 
-  .history-list .r-info .w-info .name {
-    border-left-color: var(--bew-border-color);
-  }
+    .history-list .l-info {
+      border-right-color: var(--bew-fill-2);
+    }
 
-  .history-list .r-info .w-info .username {
-    color: var(--bew-text-2);
-  }
+    .history-list .r-info .w-info .name {
+      border-left-color: var(--bew-border-color);
+    }
 
-  .history-list .r-info .w-info .username:hover {
-    color: var(--bew-theme-color);
-  }
+    .history-list .l-info .lastplay-time .history-red-round {
+      border-left-color: var(--bew-fill-2);
+    }
 
-  .history-list .r-info .history-mark {
-    border-color: var(--bew-border-color);
-  }
+    .history-wrap .time-label:before {
+      border-left-color: var(--bew-bg);
+    }
 
-  .go-top-m .go-top {
-    background-color: var(--bew-content-solid-1) !important;
-    border-color: var(--bew-border-color) !important;
+    .history-list .r-info,
+    .b-head-search .b-head-search_input {
+      background-color: unset;
+    }
 
-    &:hover {
-      background-color: var(--bew-theme-color) !important;
-      border-color: var(--bew-theme-color) !important;
+    .go-top-m .go-top {
+      background-color: var(--bew-content-solid-1) !important;
     }
   }
-}
+}