diff --git a/frontend/src/icons/svg/all-msg.svg b/frontend/src/icons/svg/all-msg.svg index 104bbacee3..320a433a2f 100644 --- a/frontend/src/icons/svg/all-msg.svg +++ b/frontend/src/icons/svg/all-msg.svg @@ -1,3 +1,3 @@ - - + + diff --git a/frontend/src/icons/svg/dashboard.svg b/frontend/src/icons/svg/dashboard.svg index 20de439dca..1b62f683a2 100644 --- a/frontend/src/icons/svg/dashboard.svg +++ b/frontend/src/icons/svg/dashboard.svg @@ -1,3 +1,3 @@ - - + + diff --git a/frontend/src/icons/svg/dept.svg b/frontend/src/icons/svg/dept.svg index 128dcfe2b5..0930bc5c3b 100644 --- a/frontend/src/icons/svg/dept.svg +++ b/frontend/src/icons/svg/dept.svg @@ -1,3 +1,3 @@ - - + + diff --git a/frontend/src/icons/svg/log.svg b/frontend/src/icons/svg/log.svg index c5b12c57aa..2c1a6704ec 100644 --- a/frontend/src/icons/svg/log.svg +++ b/frontend/src/icons/svg/log.svg @@ -1,3 +1,3 @@ - - + + diff --git a/frontend/src/icons/svg/password.svg b/frontend/src/icons/svg/password.svg index b0f6b44866..162b25f32f 100644 --- a/frontend/src/icons/svg/password.svg +++ b/frontend/src/icons/svg/password.svg @@ -1,3 +1,3 @@ - - + + diff --git a/frontend/src/icons/svg/peoples.svg b/frontend/src/icons/svg/peoples.svg index 13cecdc128..3a899eb8ce 100644 --- a/frontend/src/icons/svg/peoples.svg +++ b/frontend/src/icons/svg/peoples.svg @@ -1,3 +1,3 @@ - - + + diff --git a/frontend/src/icons/svg/plugins-new.svg b/frontend/src/icons/svg/plugins-new.svg index 7390a6252d..09668d959b 100644 --- a/frontend/src/icons/svg/plugins-new.svg +++ b/frontend/src/icons/svg/plugins-new.svg @@ -1,3 +1,3 @@ - - + + diff --git a/frontend/src/icons/svg/role.svg b/frontend/src/icons/svg/role.svg index 76524133b0..ae889b1942 100644 --- a/frontend/src/icons/svg/role.svg +++ b/frontend/src/icons/svg/role.svg @@ -1,3 +1,3 @@ - - + + diff --git a/frontend/src/icons/svg/sys-setting.svg b/frontend/src/icons/svg/sys-setting.svg index 3e6fb729e5..a85a89c5d4 100644 --- a/frontend/src/icons/svg/sys-setting.svg +++ b/frontend/src/icons/svg/sys-setting.svg @@ -1,3 +1,3 @@ - - + + diff --git a/frontend/src/icons/svg/task.svg b/frontend/src/icons/svg/task.svg index 7c5cf181ec..575ba4c18b 100644 --- a/frontend/src/icons/svg/task.svg +++ b/frontend/src/icons/svg/task.svg @@ -1,4 +1,4 @@ - - - + + + diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss index a7c44da9ab..e601d6a8e1 100644 --- a/frontend/src/styles/index.scss +++ b/frontend/src/styles/index.scss @@ -557,12 +557,6 @@ div:focus { color: var(--TextPrimary); } -.blackTheme .el-button--default { - background-color: var(--MainBG) !important; - color: var(--Main) !important; -} - - .blackTheme .title-text { color: var(--TextPrimary) !important; @@ -1176,4 +1170,36 @@ div:focus { font-size: 16px; } } +} + +.user-drawer-task { + .filter { + display: flex; + min-height: 46px; + > :nth-child(1) { + color: #1f2329; + font-family: "PingFang SC"; + font-style: normal; + font-weight: 400; + font-size: 14px; + line-height: 24px; + white-space: nowrap; + width: 116px; + } + .filter-item { + .item, + .more { + background: #f5f6f7; + } + + .active, + .more:hover { + background: rgba(51, 112, 255, 0.1); + color: #0c296e; + } + .more { + white-space: nowrap; + } + } + } } \ No newline at end of file diff --git a/frontend/src/views/system/plugin/index.vue b/frontend/src/views/system/plugin/index.vue index e83333b811..0cb123a1a5 100644 --- a/frontend/src/views/system/plugin/index.vue +++ b/frontend/src/views/system/plugin/index.vue @@ -225,9 +225,9 @@ export default { del(row) { if (row.pluginId < 4) return; const options = { - title: "确定卸载该插件？", - content: "卸载并重启服务器之后才能生效", - confirmButtonText: this.$t("卸载"), + title: "components.uninstall_the_plugin", + content: "components.it_takes_effect", + confirmButtonText: this.$t("components.uninstall"), type: "primary", cb: () => { uninstall(row.pluginId) @@ -260,7 +260,7 @@ export default { margin-right: 12px; } .el-input__inner { - background: #ffffff !important; + background: var(--ContentBG, #ffffff) !important; } } @@ -275,8 +275,8 @@ export default { .de-card-plugin { width: 270px; min-height: 188px; - background: #ffffff; - border: 1px solid #dee0e3; + background: var(--ContentBG, #ffffff); + border: 1px solid var(--deCardStrokeColor, #dee0e3); border-radius: 4px; margin: 0 24px 24px 0; &:hover { @@ -412,7 +412,7 @@ export default { display: inline-block; margin-left: 12px; .value { - color: #1f2329; + color: var(--TextPrimary, #1F2329); } } } diff --git a/frontend/src/views/system/settings/AppearanceSetting.vue b/frontend/src/views/system/settings/AppearanceSetting.vue deleted file mode 100644 index abcafc60a2..0000000000 --- a/frontend/src/views/system/settings/AppearanceSetting.vue +++ /dev/null @@ -1,80 +0,0 @@ -
- - - - - -
-
- - -
-
-
- - - - - - - diff --git a/frontend/src/views/system/task/DatasetTaskList.vue b/frontend/src/views/system/task/DatasetTaskList.vue index 44093f8031..8cf5f32c71 100644 --- a/frontend/src/views/system/task/DatasetTaskList.vue +++ b/frontend/src/views/system/task/DatasetTaskList.vue @@ -107,7 +107,8 @@ > @@ -122,12 +123,14 @@ @@ -146,7 +149,8 @@