[optimization] style contrast

Hiram-Wong · Jun 7, 2024 · 1115e15 · 1115e15
1 parent 42a8c88
commit 1115e15
Show file tree

Hide file tree

Showing 21 changed files with 147 additions and 195 deletions.
diff --git a/src/renderer/src/components/common-nav/index.vue b/src/renderer/src/components/common-nav/index.vue
@@ -181,7 +181,7 @@ const searchEvent = () => {
         transition: all 0.25s ease-in-out;
 
         :deep(.t-input) {
-          background-color: var(--td-bg-content-input);
+          background-color: var(--td-bg-content-input-2);
           border: none;
           outline: none;
           width: 148px;
@@ -232,12 +232,12 @@ const searchEvent = () => {
             }
 
             &:hover {
-              background-color: var(--td-bg-content-hover);
+              background-color: var(--td-bg-content-hover-2);
             }
           }
 
           .is-active {
-            background-color: var(--td-bg-content-active);
+            background-color: var(--td-bg-content-active-2);
           }
         }
       }

diff --git a/src/renderer/src/components/player/index.vue b/src/renderer/src/components/player/index.vue
@@ -87,7 +87,7 @@ defineExpose({
     position: relative;
     width: 100%;
     height: 100%;
-    background: var(--td-bg-color-page) url(@/assets/bg-player.jpg) center center;
+    background: url(@/assets/bg-player.jpg) center center;
 
     .player {
       width: 100%;

diff --git a/src/renderer/src/components/share-popup/index.vue b/src/renderer/src/components/share-popup/index.vue
@@ -176,7 +176,7 @@ const copyShareUrl = async () => {
     width: 100%;
     text-align: right;
     vertical-align: middle;
-    background: var(--td-bg-content-input);
+    background: var(--td-bg-content-input-2);
     height: 32px;
     border-radius: var(--td-radius-round);
 

diff --git a/src/renderer/src/layouts/components/Header.vue b/src/renderer/src/layouts/components/Header.vue
@@ -48,7 +48,7 @@ const handleMouseDown = (event) => {
   display: flex;
   justify-content: space-between;
   height: 32px;
-  margin: var(--td-comp-margin-m) var(--td-comp-margin-xs);
+  margin: var(--td-comp-margin-m) var(--td-comp-margin-xs) var(--td-comp-margin-m) 0;
 
   .no-drag {
     -webkit-app-region: no-drag;

diff --git a/src/renderer/src/layouts/components/HistoryControl.vue b/src/renderer/src/layouts/components/HistoryControl.vue
@@ -45,7 +45,7 @@ const gotoRefresh = () => {
   display: flex;
   justify-content: space-around;
   align-items: center;
-  background: var(--td-bg-content-input);
+  background: var(--td-bg-content-input-1);
   height: 100%;
   width: 100px;
   border-radius: 50px;

diff --git a/src/renderer/src/layouts/components/PlayShow.vue b/src/renderer/src/layouts/components/PlayShow.vue
@@ -54,9 +54,9 @@ const destroyPlayerWindowEvent = () => {
 
     .mini-box {
       border-radius: var(--td-radius-round);
+      background-color: var(--td-bg-content-input-1);
       height: 100%;
       width: 140px;
-      background-color: var(--td-bg-color-component);
       display: flex;
       align-items: center;
       cursor: pointer;

diff --git a/src/renderer/src/layouts/components/SearchBar.vue b/src/renderer/src/layouts/components/SearchBar.vue
@@ -421,7 +421,7 @@ hotReloadeventBus.on(() => {
   :deep(.t-input) {
     border-color: transparent;
     border-radius: 50px;
-    background: var(--td-bg-content-input);
+    background: var(--td-bg-content-input-1);
     box-shadow: none;
 
     &.t-is-focused .t-input__prefix>.t-icon {

diff --git a/src/renderer/src/layouts/index.vue b/src/renderer/src/layouts/index.vue
@@ -40,7 +40,6 @@ const sideMenu = computed(() => {
 
 <style lang="less" scoped>
 .t-layout {
-  background: var(--td-bg-aside);
   overflow-x: hidden;
 }
 </style>
diff --git a/src/renderer/src/locales/lang/en_US/pages/setting.ts b/src/renderer/src/locales/lang/en_US/pages/setting.ts
@@ -320,11 +320,13 @@ export default {
     help: 'Help',
     doc: 'Doc',
     ai: 'Ai',
-    title: 'Source Tool [Hjdhnx United]',
+    title: 'Source Tool',
     template: 'Template',
     templateTip: 'select one default template to edit',
     run: 'Run',
     fileManage: 'File',
+    sift: 'Sift',
+    editSource: 'Edit',
     placeholder: {
       reqHeader: '{ "User-Agent": "Mozilla/5.0 zyplayer" }',
       reqBody: '{ "key": "01b9b7" }',

diff --git a/src/renderer/src/locales/lang/zh_CN/pages/setting.ts b/src/renderer/src/locales/lang/zh_CN/pages/setting.ts
@@ -321,11 +321,13 @@ export default {
     doc: '文档',
     ai: '智脑',
     tool: '工具',
-    title: '写源工具 [道长联名]',
+    title: '写源工具',
     template: '模板',
     templateTip: '选择一个要编辑的默认模板',
     run: '运行',
     fileManage: '文件',
+    sift: '筛选',
+    editSource: '写源',
     placeholder: {
       reqHeader: '{ "User-Agent": "Mozilla/5.0 zyplayer" }',
       reqBody: '{ "key": "01b9b7" }',
@@ -455,4 +457,30 @@ export default {
       },
     },
   },
+  tool: {
+    sift: {
+      title: '静态筛选',
+      rule: {
+        className: '',
+        classUrl: '',
+        url: '',
+        deatil: '',
+        keyEx: '',
+        class: '大类',
+        excluded: '排除',
+        link: '链接',
+        filter: '筛选',
+        filterInfo: '详细',
+        try: '执行',
+        reg: '正则',
+        plot: '剧情',
+        area: '地区',
+        lang: '语言',
+        year: '年份',
+        letter: '字母',
+        sort: '排序',
+
+      },
+    },
+  },
 };
diff --git a/src/renderer/src/pages/Analyze.vue b/src/renderer/src/pages/Analyze.vue
@@ -335,7 +335,7 @@ const changeDefaultEvent = async (id) => {
           width: 100%;
           border-radius: var(--td-radius-large);
           position: absolute;
-          background: var(--td-bg-color-page) url(@/assets/bg-player.jpg) center center;
+          background: url(@/assets/bg-player.jpg) center center;
         }
 
         .head-info-section {
@@ -454,12 +454,12 @@ const changeDefaultEvent = async (id) => {
           height: 40px;
           padding: 0;
           border-radius: 20px;
-          background-color: var(--td-bg-content-input);
+          background-color: var(--td-bg-content-input-2);
           display: flex;
 
           :deep(.t-input) {
             border-radius: 20px;
-            background-color: var(--td-bg-content-input);
+            background-color: var(--td-bg-content-input-2);
             border: none;
             outline: none;
           }
@@ -517,52 +517,6 @@ const changeDefaultEvent = async (id) => {
         }
       }
     }
-
-    .analyze-flex {
-      .mini-box {
-        border-radius: var(--td-radius-round);
-        height: 31px;
-        width: 140px;
-        background-color: var(--td-bg-color-component);
-        display: flex;
-        align-items: center;
-        cursor: pointer;
-
-        &-close {
-          margin-right: var(--td-comp-margin-s);
-          width: 15px;
-          display: flex;
-          justify-content: center;
-          color: var(--td-brand-color);
-
-          svg {
-            margin: 0 auto;
-          }
-        }
-
-        &-title-warp {
-          margin: 0 var(--td-comp-margin-xs) 0 var(--td-comp-margin-l);
-          overflow: hidden;
-          width: 100%;
-
-          .mini-box-title {
-            display: inline-block;
-            white-space: nowrap;
-            animation: marquee 10s linear infinite;
-          }
-
-          @keyframes marquee {
-            0% {
-              transform: translateX(100%);
-            }
-
-            100% {
-              transform: translateX(-100%);
-            }
-          }
-        }
-      }
-    }
   }
 }
 

diff --git a/src/renderer/src/pages/Play.vue b/src/renderer/src/pages/Play.vue
@@ -1310,7 +1310,7 @@ window.electron.ipcRenderer.on('destroy-playerWindow', () => {
         height: 32px;
         width: 120px;
         border-radius: var(--td-radius-medium);
-        background-color: var(--td-bg-content-input);
+        background-color: var(--td-bg-content-active-1);
         padding: 2px 10px;
         transition: 0.15s linear;
         cursor: pointer;
@@ -1321,7 +1321,7 @@ window.electron.ipcRenderer.on('destroy-playerWindow', () => {
         }
 
         &:hover {
-          background-color: var(--td-bg-content-active);
+          background-color: var(--td-bg-content-hover-1);
         }
       }
     }
@@ -1387,7 +1387,7 @@ window.electron.ipcRenderer.on('destroy-playerWindow', () => {
           position: relative;
           width: 100%;
           height: 100%;
-          background: var(--td-bg-color-page) url(@/assets/bg-player.jpg) center center;
+          background: url(@/assets/bg-player.jpg) center center;
 
           .player-media {
             width: 100%;
@@ -1449,7 +1449,7 @@ window.electron.ipcRenderer.on('destroy-playerWindow', () => {
       width: 300px;
       height: 100%;
       position: relative;
-      background: var(--td-bg-color-container);
+      background: var(--td-bg-container);
       border-radius: var(--td-radius-medium);
       padding: 10px 10px 0;
       box-sizing: border-box;
@@ -1536,13 +1536,17 @@ window.electron.ipcRenderer.on('destroy-playerWindow', () => {
                 }
 
                 &:hover {
-                  background-color: var(--td-bg-content-active);
+                  background-color: var(--td-bg-content-hover-2);
                   border-radius: var(--td-radius-medium);
                 }
               }
             }
           }
 
+          :deep(.t-tab-panel) {
+            background-color: var(--td-bg-container);
+          }
+
           .channel-wrap,
           .epg-wrap,
           .drive-wrap {
@@ -1752,7 +1756,7 @@ window.electron.ipcRenderer.on('destroy-playerWindow', () => {
                   right: 1px;
                   bottom: 1px;
                   border-radius: 8px;
-                  background-color: var(--td-bg-color-container);
+                  background-color: var(--td-bg-container);
                   z-index: 2;
                 }
 

diff --git a/src/renderer/src/pages/analyze/DialogHistory.vue b/src/renderer/src/pages/analyze/DialogHistory.vue
@@ -4,11 +4,7 @@
     <div v-for="item in historyList" :key="item.id" @click="historyPlayEvent(item)">
       <div class="history-item">
         <div class="date">{{ formatDate(item.date) }}</div>
-        <t-popup placement="bottom" :content="item.videoName" :overlay-style="{ maxWidth: '290px' }"
-          :overlay-inner-style="{
-            background: 'var(--td-bg-color-page)',
-            boxShadow: '0 15px 30px rgba(0,0,0,.2)',
-          }">
+        <t-popup placement="bottom" :content="item.videoName" :overlay-style="{ maxWidth: '290px' }">
           <div class="title">{{ item.videoName }}</div>
         </t-popup>
         <div class="clear" @click.stop="histroyDeleteEvent(item.id)">
@@ -75,7 +71,7 @@ watch(
 );
 
 const infiniteId = ref(+new Date());
-const historyList = ref([]);
+const historyList = ref<any>([]);
 const pagination = ref({
   pageIndex: 0,
   pageSize: 32,
@@ -122,7 +118,7 @@ const getHistoryList = async () => {
   const { pageIndex, pageSize } = pagination.value;
   const res = await fetchHistoryList(pageIndex, pageSize, 'analyze');
   const { data, total } = res;
-  historyList.value = _.unionWith(historyList.value, data, _.isEqual);
+  historyList.value = _.unionWith(historyList.value, data, _.isEqual) as any;
 
   pagination.value.count = total;
   pagination.value.pageIndex++;
@@ -160,7 +156,7 @@ const formatDate = (timestamp) => {
 
     &:hover {
       border-radius: var(--td-radius-medium);
-      background-color: rgba(132, 133, 141, 0.16);
+      background-color: var(--td-bg-content-active-2);
     }
   }
 

diff --git a/src/renderer/src/pages/analyze/DialogSearch.vue b/src/renderer/src/pages/analyze/DialogSearch.vue
@@ -363,7 +363,7 @@ const closeDialog = () => {
   height: 40px;
   align-items: center;
   justify-content: space-between;
-  background-color: var(--td-bg-color-page);
+  background-color: var(--td-bg-content-input);
   box-shadow: var(--td-shadow-1);
   border-radius: 10px;
   padding-left: 24px;

diff --git a/src/renderer/src/pages/setting/analyze/AnalyzeSetting.vue b/src/renderer/src/pages/setting/analyze/AnalyzeSetting.vue
@@ -318,7 +318,7 @@ const defaultEvent = async (row) => {
       display: flex;
       height: var(--td-comp-size-m);
       padding: 0 var(--td-comp-paddingLR-xs);
-      background-color: var(--td-bg-content-input);
+      background-color: var(--td-bg-content-input-2);
       border-radius: var(--td-radius-default);
       align-items: center;
       border-radius: var(--td-radius-medium);
@@ -336,30 +336,9 @@ const defaultEvent = async (row) => {
         &:hover {
           transition: all 0.2s ease 0s;
           color: var(--td-text-color-primary);
-          background-color: var(--td-bg-color-container-hover);
         }
       }
     }
   }
-
-  :deep(.t-table) {
-    background-color: var(--td-bg-color-container);
-
-    tr {
-      background-color: var(--td-bg-color-container);
-
-      &:hover {
-        background-color: var(--td-bg-color-container-hover);
-      }
-    }
-  }
-
-  :deep(.t-table__header--fixed):not(.t-table__header--multiple)>tr>th {
-    background-color: var(--td-bg-color-container);
-  }
-
-  :deep(.t-table__pagination) {
-    background-color: var(--td-bg-color-container);
-  }
 }
 </style>
diff --git a/src/renderer/src/pages/setting/base/components/DialogBarrage.vue b/src/renderer/src/pages/setting/base/components/DialogBarrage.vue
@@ -95,4 +95,8 @@ const onClickCloseBtn = () => {
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+:deep(.t-tag--default) {
+  background-color: var(--td-bg-content-active-2);
+}
+</style>
diff --git a/src/renderer/src/pages/setting/base/components/DialogUA.vue b/src/renderer/src/pages/setting/base/components/DialogUA.vue
@@ -103,4 +103,8 @@ const onClickCloseBtn = () => {
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+:deep(.t-radio-group) {
+  margin-bottom: 0 !important;
+}
+</style>