Skip to content

Commit 3f44b81

Browse files
committed
style: 主题样式优化
1 parent ec372db commit 3f44b81

File tree

11 files changed

+259
-103
lines changed

11 files changed

+259
-103
lines changed

frontend/src/components/system-upgrade/index.vue

+9-9
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
<div>
33
<div class="flex w-full flex-col gap-2 md:flex-row items-center">
44
<div class="flex flex-wrap items-center" v-if="props.footer">
5-
<el-button type="primary" link @click="toForum">
5+
<el-link type="primary" :underline="false" @click="toForum">
66
<span class="font-normal">{{ $t('setting.forum') }}</span>
7-
</el-button>
7+
</el-link>
88
<el-divider direction="vertical" />
9-
<el-button type="primary" link @click="toDoc">
9+
<el-link type="primary" :underline="false" @click="toDoc">
1010
<span class="font-normal">{{ $t('setting.doc2') }}</span>
11-
</el-button>
11+
</el-link>
1212
<el-divider direction="vertical" />
13-
<el-button type="primary" link @click="toGithub">
13+
<el-link type="primary" :underline="false" @click="toGithub">
1414
<span class="font-normal">{{ $t('setting.project') }}</span>
15-
</el-button>
15+
</el-link>
1616
<el-divider v-if="!mobile" direction="vertical" />
1717
</div>
1818
<div class="flex flex-wrap items-center">
@@ -27,14 +27,14 @@
2727
({{ $t('setting.hasNewVersion') }})
2828
</el-link>
2929
</el-badge>
30-
<el-button
30+
<el-link
3131
v-if="version !== 'Waiting' && !globalStore.hasNewVersion"
3232
type="primary"
33-
link
33+
:underline="false"
3434
@click="onLoadUpgradeInfo"
3535
>
3636
({{ $t('setting.upgradeCheck') }})
37-
</el-button>
37+
</el-link>
3838
<el-tag v-if="version === 'Waiting'" round style="margin-left: 10px">
3939
{{ $t('setting.upgrading') }}
4040
</el-tag>

frontend/src/styles/common.scss

+21
Original file line numberDiff line numberDiff line change
@@ -464,3 +464,24 @@ html {
464464
.monaco-editor-tree-dark .el-tree-node.is-current > .el-tree-node__content {
465465
background-color: #111417;
466466
}
467+
.check-label{
468+
background: var(--panel-main-bg-color-10) !important;
469+
.check-label-a {
470+
color: var(--panel-color-primary);
471+
}
472+
}
473+
.check-content {
474+
background: var(--panel-main-bg-color-10);
475+
pre {
476+
margin: 0;
477+
width: 350px;
478+
overflow: hidden;
479+
text-overflow: ellipsis;
480+
}
481+
}
482+
483+
484+
.el-descriptions {
485+
overflow: hidden;
486+
text-overflow: ellipsis;
487+
}

frontend/src/styles/element-dark.scss

+131-17
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,24 @@ html.dark {
2222
--panel-main-bg-color-9: #2E313D;
2323
--panel-main-bg-color-10: #242633;
2424
--panel-main-bg-color-11: #60626F;
25+
--panel-main-bg-color-12: #000000;
2526

26-
--panel-alert-error-bg-color: #54293A;
27-
--panel-alert-error-text-color: #E2324F;
27+
--panel-alert-error-bg-color: #fef0f0;
28+
--panel-alert-error-text-color: #f56c6c;
2829
--panel-alert-error-hover-bg-color: #E9657B;
2930

30-
--panel-alert-success-bg-color: #1E5146;
31-
--panel-alert-success-text-color: #11B671;
31+
--panel-alert-success-bg-color: #e1f3d8;
32+
--panel-alert-success-text-color: #67c23a;
3233
--panel-alert-success-hover-bg-color: #4DC894;
3334

3435
--panel-alert-warning-bg-color: #59472A;
3536
--panel-alert-warning-text-color: #EDAC2C;
3637
--panel-alert-warning-hover-bg-color: #F1C161;
3738

39+
--panel-alert-info-bg-color: var(--panel-main-bg-color-7);
40+
--panel-alert-info-text-color: var(--panel-text-color-white);
41+
--panel-alert-info-hover-bg-color: var(--panel-main-bg-color-4);
42+
3843
--el-color-success: #3fb950;
3944
--el-color-success-light-5: #4DC894;
4045
--el-color-success-light-8: #3fb950;
@@ -55,14 +60,11 @@ html.dark {
5560
--el-color-error-light-8: #E2324F;
5661
--el-color-error-light-9: #54293A;
5762

58-
--el-color-info: var(--panel-text-color-white);
63+
--el-color-info: var(--panel-main-bg-color-2);
5964
--el-color-info-light-5: var(--panel-main-bg-color-3);
60-
--el-color-info-light-8: var(--panel-text-color-white);
65+
--el-color-info-light-8: var(--panel-color-primary);
6166
--el-color-info-light-9: var(--panel-main-bg-color-8);
6267

63-
--panel-alert-info-bg-color: var(--panel-main-bg-color-8);
64-
--panel-alert-info-text-color: var(--panel-text-color-white);
65-
--panel-alert-info-hover-bg-color: var(--panel-main-bg-color-4);
6668

6769
--panel-pie-bg-color: #434552;
6870
--panel-text-color-white: #ffffff;
@@ -78,7 +80,8 @@ html.dark {
7880
--el-scrollbar-bg-color: var(--panel-main-bg-color-8);
7981
--el-border-color-darker: var(--panel-main-bg-color-6);
8082

81-
--panel-border: 2px solid var(--panel-main-bg-color-8);
83+
--panel-border: 1px solid var(--panel-main-bg-color-8);
84+
--panel-border-color: var(--panel-main-bg-color-8);
8285
--panel-button-active: var(--panel-main-bg-color-10);
8386
--panel-button-text-color: var(--panel-main-bg-color-10);
8487
--panel-button-bg-color: var(--panel-color-primary);
@@ -113,6 +116,9 @@ html.dark {
113116

114117
--el-text-color-placeholder: var(--panel-main-bg-color-4);
115118

119+
.el-radio-button {
120+
--el-radio-button-checked-text-color: var(--panel-main-bg-color-10);
121+
}
116122
.el-descriptions__content:not(.is-bordered-label) {
117123
color: var(--panel-main-bg-color-3);
118124
}
@@ -180,21 +186,52 @@ html.dark {
180186
}
181187

182188
.el-button--primary {
189+
--el-button-text-color: var(--panel-main-bg-color-10);
183190
--el-button-hover-link-text-color: var(--panel-color-primary-light-1);
191+
&.tag-button,
192+
&.brief-button {
193+
--el-button-text-color: var(--panel-main-bg-color-10);
194+
--el-button-hover-text-color: var(--el-color-white);
195+
--el-button-hover-border-color:var(--el-color-primary);
196+
--el-button-hover-bg-color: var(--el-color-primary);
197+
}
198+
199+
&.app-button {
200+
--el-button-text-color: var(--el-color-primary);
201+
}
202+
203+
&.h-app-button {
204+
--el-button-text-color: var(--panel-main-bg-color-10);
205+
--el-button-hover-text-color: var(--el-color-white);
206+
--el-button-hover-border-color: var(--el-color-primary);
207+
--el-button-hover-bg-color: var(--el-color-primary);
208+
}
184209
}
185210

186211
.el-button--primary.is-plain, .el-button--primary.is-text, .el-button--primary.is-link {
212+
--el-button-text-color: var(--panel-main-bg-color-2);
187213
--el-button-bg-color: var(--panel-main-bg-color-9);
188214
--el-button-border-color: var(--panel-main-bg-color-8);
189215
--el-button-hover-bg-color: var(--panel-main-bg-color-9);
190216
--el-button-hover-border-color: var(--panel-main-bg-color-8);
191217
}
192218

219+
.el-button--primary.is-text,.el-button--primary.is-link {
220+
--el-button-text-color: var(--panel-color-primary);
221+
}
222+
193223
.el-button--primary:hover {
194-
--el-button-hover-text-color: var(--panel-text-color-white);
195-
--el-button-border-color: var(--el-color-primary-light-3);
196-
--el-button-hover-bg-color: var(--el-color-primary-light-3);
197-
--el-button-hover-border-color: var(--el-color-primary-light-3);
224+
--el-button-hover-text-color: var(--panel-main-bg-color-2);
225+
--el-button-border-color: var(--el-color-primary);
226+
--el-button-hover-bg-color: var(--panel-main-bg-color-9);
227+
--el-button-hover-border-color: var(--panel-main-bg-color-8);
228+
}
229+
230+
.el-button--primary.is-plain:hover {
231+
--el-button-hover-text-color: var(--panel-main-bg-color-10);
232+
--el-button-border-color: var(--el-color-primary);
233+
--el-button-hover-bg-color: var(--el-color-primary);
234+
--el-button-hover-border-color: var(--el-color-primary);
198235
}
199236

200237
.el-button--primary:active {
@@ -231,7 +268,7 @@ html.dark {
231268
}
232269

233270
.el-dialog {
234-
background-color: var(--panel-main-bg-color-8);
271+
background-color: var(--panel-main-bg-color-9);
235272
border: 1px solid var(--panel-border-color);
236273

237274
.el-dialog__header {
@@ -265,15 +302,24 @@ html.dark {
265302
}
266303

267304
.md-editor-dark {
268-
--md-bk-color: var(--panel-main-bg-color-8);
305+
--md-bk-color: var(--panel-main-bg-color-9);
269306
}
307+
270308
.md-editor-dark .md-editor-preview {
271309
--md-theme-color: var(--el-text-color-primary);
272310
}
311+
273312
.md-editor-dark .default-theme a {
274313
--md-theme-link-color: var(--el-color-primary);
275314
}
276315

316+
.md-editor-dark .default-theme pre code {
317+
background-color: var(--panel-main-bg-color-8);
318+
}
319+
.md-editor-dark .default-theme pre:before {
320+
background-color: var(--panel-main-bg-color-10);
321+
}
322+
277323
.el-descriptions__title {
278324
color: var(--el-text-color-primary);
279325
}
@@ -297,12 +343,20 @@ html.dark {
297343
box-shadow: 0 0 4px rgba(0, 94, 235, 0.1);
298344
border: 0.5px solid var(--panel-main-bg-color-7);
299345
}
346+
.el-drawer {
347+
.cm-editor {
348+
background-color: var(--panel-main-bg-color-10);
349+
}
350+
.cm-gutters {
351+
background-color: var(--panel-main-bg-color-10);
352+
}
353+
}
300354

301355
.cm-editor {
302356
background-color: var(--panel-main-bg-color-9);
303357
}
304358
.cm-gutters {
305-
background-color: var(--panel-main-bg-color-8);
359+
background-color: var(--panel-main-bg-color-9);
306360
}
307361

308362
// scroll-bar
@@ -312,6 +366,9 @@ html.dark {
312366
::-webkit-scrollbar-thumb {
313367
background-color: var(--el-border-color-darker);
314368
}
369+
::-webkit-scrollbar-corner {
370+
background-color: var(--el-scrollbar-bg-color);
371+
}
315372

316373
.app-warn {
317374
span {
@@ -325,4 +382,61 @@ html.dark {
325382
}
326383
}
327384

385+
.el-table {
386+
--el-table-bg-color: var(--el-bg-color);
387+
--el-table-tr-bg-color: var(--el-bg-color);
388+
--el-table-header-bg-color: var(--el-bg-color);
389+
--el-table-border: 1px solid var(--panel-main-bg-color-8);
390+
--el-table-border-color: var(--panel-main-bg-color-8);
391+
}
392+
393+
.el-message-box {
394+
--el-messagebox-title-color: var(--el-menu-text-color);
395+
border: 1px solid var(--panel-border-color);
396+
}
397+
398+
.el-popover {
399+
--el-popover-title-text-color: var(--panel-main-bg-color-2);
400+
border: 1px solid var(--panel-border-color);
401+
}
402+
403+
.app-wrapper {
404+
.main-container {
405+
background-color: var(--panel-main-bg-color-9) !important;
406+
}
407+
.app-footer {
408+
background-color: var(--panel-main-bg-color-9) !important;
409+
border-top: var(--panel-border);
410+
}
411+
.mobile-header {
412+
background-color: var(--panel-main-bg-color-9) !important;
413+
border-bottom: var(--panel-border);
414+
color: #ffffff;
415+
}
416+
}
417+
418+
.router_card_button {
419+
.el-radio-button__inner {
420+
background: none !important;
421+
}
422+
.el-radio-button__original-radio:checked + .el-radio-button__inner {
423+
color: var(--panel-main-bg-color-10);
424+
background-color: var(--panel-color-primary) !important;
425+
box-shadow: none !important;
426+
border: none !important;
427+
}
428+
}
429+
430+
.el-date-table td.in-range .el-date-table-cell {
431+
background-color: var(--panel-main-bg-color-8);
432+
}
433+
434+
.el-collapse-item__header {
435+
color: #ffffff;
436+
background-color: var(--panel-main-bg-color-10) !important;
437+
}
438+
439+
.el-loading-mask {
440+
background-color: rgba(36, 38, 51, 0.8);
441+
}
328442
}

frontend/src/views/app-store/detail/index.vue

+6-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ defineExpose({
162162
});
163163
</script>
164164

165-
<style lang="scss">
165+
<style lang="scss" scoped>
166166
.brief {
167167
.name {
168168
span {
@@ -183,6 +183,7 @@ defineExpose({
183183
.icon {
184184
width: 180px;
185185
height: 180px;
186+
background-color: #ffffff;
186187
}
187188
188189
.version {
@@ -196,4 +197,8 @@ defineExpose({
196197
}
197198
}
198199
}
200+
201+
:deep(.md-editor-dark) {
202+
background-color: var(--panel-main-bg-color-9);
203+
}
199204
</style>

frontend/src/views/app-store/installed/check/index.vue

+12-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<el-dialog v-model="open" :title="$t('app.checkTitle')" width="50%" :close-on-click-modal="false">
2+
<el-dialog v-model="open" :title="$t('app.checkTitle')" width="40%" :close-on-click-modal="false">
33
<el-row>
44
<el-col :span="20" :offset="2" v-if="open">
55
<el-alert
@@ -9,11 +9,18 @@
99
show-icon
1010
:closable="false"
1111
/>
12-
<br />
13-
<el-descriptions border :column="1">
14-
<el-descriptions-item v-for="(item, key) in map" :key="key">
12+
<el-descriptions :column="1" border>
13+
<el-descriptions-item
14+
v-for="(item, key) in map"
15+
:key="key"
16+
label-class-name="check-label"
17+
class-name="check-content"
18+
min-width="60px"
19+
>
1520
<template #label>
16-
<a href="javascript:void(0);" @click="toPage(item[0])">{{ $t('app.' + item[0]) }}</a>
21+
<a href="javascript:void(0);" class="check-label-a" @click="toPage(item[0])">
22+
{{ $t('app.' + item[0]) }}
23+
</a>
1724
</template>
1825
<span class="resources">
1926
{{ map.get(item[0]).toString() }}

0 commit comments

Comments
 (0)