Skip to content

Commit ffcfc4d

Browse files
authored
Merge pull request #266 from shiux-lab/main
[optimization] Some details
2 parents b9d8d46 + f3db72e commit ffcfc4d

File tree

6 files changed

+25
-16
lines changed

6 files changed

+25
-16
lines changed

src/renderer/src/components/common-nav/index.vue

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
<div class="nav-sub-tab nav-sub-tab-header">
55
<div class="header" v-if="!isVisible.search">
66
<p class="title">{{ title }}</p>
7-
<data-search-icon size="large" class="icon" v-if="search" @click="isVisible.search = true" />
7+
<t-popup :content="$t('pages.search.searchSource')">
8+
<data-search-icon size="large" class="icon" v-if="search" @click="isVisible.search = true" />
9+
</t-popup>
810
</div>
911
<div class="search" v-if="isVisible.search" ref="headerOutsideRef">
1012
<t-input :placeholder="$t('pages.setting.placeholder.general')" clearable v-model="searchText"
@@ -161,7 +163,7 @@ const searchEvent = () => {
161163
162164
.header {
163165
display: flex;
164-
align-items: flex-end;
166+
align-items: center;
165167
height: 32px;
166168
transition: all 0.25s ease-in-out;
167169
@@ -172,7 +174,8 @@ const searchEvent = () => {
172174
}
173175
174176
.icon {
175-
margin-left: var(--td-comp-margin-xxs);
177+
margin-left: auto;
178+
margin-right: var(--td-comp-margin-s);
176179
cursor: pointer;
177180
}
178181
}

src/renderer/src/layouts/components/SystemControl.vue

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,9 @@
99
</div>
1010
<div class="control-maximize control-item control-icon" @click="handleWindow('max')">
1111
<svg v-if="!isMaxed" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 11 11">
12-
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 11 11">
13-
<path
14-
d="M0,1.7v7.6C0,10.2,0.8,11,1.7,11h7.6c0.9,0,1.7-0.8,1.7-1.7V1.7C11,0.8,10.2,0,9.3,0H1.7C0.8,0,0,0.8,0,1.7z M8.8,9.9H2.2c-0.6,0-1.1-0.5-1.1-1.1V2.2c0-0.6,0.5-1.1,1.1-1.1h6.7c0.6,0,1.1,0.5,1.1,1.1v6.7C9.9,9.4,9.4,9.9,8.8,9.9z">
15-
</path>
16-
</svg>
12+
<path
13+
d="M0,1.7v7.6C0,10.2,0.8,11,1.7,11h7.6c0.9,0,1.7-0.8,1.7-1.7V1.7C11,0.8,10.2,0,9.3,0H1.7C0.8,0,0,0.8,0,1.7z M8.8,9.9H2.2c-0.6,0-1.1-0.5-1.1-1.1V2.2c0-0.6,0.5-1.1,1.1-1.1h6.7c0.6,0,1.1,0.5,1.1,1.1v6.7C9.9,9.4,9.4,9.9,8.8,9.9z">
14+
</path>
1715
</svg>
1816
<svg v-else xmlns="http://www.w3.org/2000/svg" viewBox="0 0 11 11">
1917
<path
@@ -79,7 +77,7 @@ win.on('unmaximize', () => {
7977
display: flex;
8078
justify-content: center;
8179
align-items: center;
82-
border-radius: 5px;
80+
border-radius: var(--td-radius-default);
8381
8482
svg {
8583
width: 1em;

src/renderer/src/locales/lang/en_US/pages/search.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ export default {
44
site: 'Local',
55
group: 'Group',
66
all: 'All',
7-
searchHistory: 'SearchHistory',
7+
searchHistory: 'Search History',
8+
searchSource: 'Search Source',
89
searchPlaceholder: 'Search resources',
9-
hotNoData: 'No data for the past three days'
10-
}
10+
hotNoData: 'No data for the past three days',
11+
};

src/renderer/src/locales/lang/zh_CN/pages/search.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ export default {
55
group: '组内',
66
all: '全站',
77
searchHistory: '搜索历史',
8+
searchSource: '搜索源',
89
searchPlaceholder: '搜索全网资源',
9-
hotNoData: '暂无近三天数据, 请查看其他分类'
10-
}
10+
hotNoData: '暂无近三天数据, 请查看其他分类',
11+
};

src/renderer/src/pages/Film.vue

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -744,6 +744,11 @@ filmReloadeventBus.on(async () => {
744744
width: 100%;
745745
overflow: hidden;
746746
}
747+
748+
.quick_filter {
749+
display: flex;
750+
align-items: center;
751+
}
747752
}
748753
749754
.container-full {

src/renderer/src/style/theme/theme.less

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@
1515
--td-brand-color-8: #005333;
1616
--td-brand-color-9: #003b23;
1717
--td-brand-color-10: #002515;
18+
--td-radius-default: var(--td-radius-medium);
1819
}
1920

20-
:root[theme-mode="dark"] {
21+
:root[theme-mode='dark'] {
2122
--td-brand-color-light: var(--td-brand-color-1);
2223
--td-brand-color-focus: var(--td-brand-color-2);
2324
--td-brand-color-disabled: var(--td-brand-color-3);
@@ -34,4 +35,4 @@
3435
--td-brand-color-8: #94dab2;
3536
--td-brand-color-9: #c8f2d7;
3637
--td-brand-color-10: #e4f9e9;
37-
}
38+
}

0 commit comments

Comments
 (0)