From d04a35565ea72d05e5699025335e56f5583ac934 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=98=AD?= <81747598+lan-yonghui@users.noreply.github.com> Date: Thu, 14 Nov 2024 17:32:01 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=BB=E9=A2=98=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20(#7053)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/api/modules/files.ts | 2 +- frontend/src/styles/element-dark.scss | 30 ++++++++++++------- frontend/src/styles/element.scss | 3 -- .../views/app-store/installed/check/index.vue | 2 +- .../src/views/container/container/index.vue | 2 +- .../src/views/database/mysql/check/index.vue | 2 +- .../views/database/postgresql/check/index.vue | 2 +- .../src/views/database/redis/check/index.vue | 2 +- .../setting/snapshot/snap_status/index.vue | 3 -- .../views/website/runtime/php/check/index.vue | 2 +- 10 files changed, 26 insertions(+), 24 deletions(-) diff --git a/frontend/src/api/modules/files.ts b/frontend/src/api/modules/files.ts index 2f88d4af2..f1d438e19 100644 --- a/frontend/src/api/modules/files.ts +++ b/frontend/src/api/modules/files.ts @@ -74,7 +74,7 @@ export const WgetFile = (params: File.FileWget) => { }; export const MoveFile = (params: File.FileMove) => { - return http.post('files/move', params); + return http.post('files/move', params, TimeoutEnum.T_5M); }; export const DownloadFile = (params: File.FileDownload) => { diff --git a/frontend/src/styles/element-dark.scss b/frontend/src/styles/element-dark.scss index cd6bd2065..6d7263cf9 100644 --- a/frontend/src/styles/element-dark.scss +++ b/frontend/src/styles/element-dark.scss @@ -43,27 +43,27 @@ html.dark { --el-color-success: #3fb950; --el-color-success-light-5: #4DC894; --el-color-success-light-8: #3fb950; - --el-color-success-light-9: #1E5146; + --el-color-success-light-9: var(--panel-main-bg-color-9); --el-color-warning: #EDAC2C; --el-color-warning-light-5: #F1C161; --el-color-warning-light-8: #EDAC2C; - --el-color-warning-light-9: #59472A; + --el-color-warning-light-9: var(--panel-main-bg-color-9); --el-color-danger: #E2324F; --el-color-danger-light-5: #E9657B; --el-color-danger-light-8: #E2324F; - --el-color-danger-light-9: #54293A; + --el-color-danger-light-9: var(--panel-main-bg-color-9); --el-color-error: #E2324F; --el-color-error-light-5: #E9657B; --el-color-error-light-8: #E2324F; - --el-color-error-light-9: #54293A; + --el-color-error-light-9: var(--panel-main-bg-color-9); - --el-color-info: var(--panel-main-bg-color-2); + --el-color-info: var(--panel-main-bg-color-3); --el-color-info-light-5: var(--panel-main-bg-color-3); - --el-color-info-light-8: var(--panel-color-primary); - --el-color-info-light-9: var(--panel-main-bg-color-8); + --el-color-info-light-8: var(--panel-main-bg-color-3); + --el-color-info-light-9: var(--panel-main-bg-color-9); --panel-pie-bg-color: #434552; @@ -71,8 +71,12 @@ html.dark { --el-color-primary: var(--panel-color-primary); + --el-color-primary-light-1: var(--panel-color-primary-light-1); + --el-color-primary-light-2: var(--panel-color-primary-light-2); --el-color-primary-light-3: var(--panel-color-primary-light-3); + --el-color-primary-light-4: var(--panel-color-primary-light-4); --el-color-primary-light-5: var(--panel-color-primary-light-5); + --el-color-primary-light-6: var(--panel-color-primary-light-6); --el-color-primary-light-7: var(--panel-color-primary-light-7); --el-color-primary-light-8: var(--panel-color-primary-light-8); --el-color-primary-light-9: var(--panel-color-primary-light-9); @@ -185,6 +189,11 @@ html.dark { --el-card-bg-color: var(--panel-main-bg-color-10) } + .el-button:hover { + --el-button-hover-border-color:var(--panel-main-bg-color-11); + --el-button-hover-bg-color: var(--panel-main-bg-color-10); + } + .el-button--primary { --el-button-text-color: var(--panel-main-bg-color-10); --el-button-hover-link-text-color: var(--panel-color-primary-light-1); @@ -221,9 +230,9 @@ html.dark { } .el-button--primary:hover { - --el-button-hover-text-color: var(--panel-main-bg-color-2); + --el-button-hover-text-color: var(--panel-main-bg-color-7); --el-button-border-color: var(--el-color-primary); - --el-button-hover-bg-color: var(--panel-main-bg-color-9); + --el-button-hover-bg-color: var(--panel-color-primary-light-2); --el-button-hover-border-color: var(--panel-main-bg-color-8); } @@ -272,7 +281,6 @@ html.dark { border: 1px solid var(--panel-border-color); .el-dialog__header { - border-bottom: var(--panel-border); color: var(--el-text-color-primary); .el-dialog__title { @@ -288,7 +296,7 @@ html.dark { .el-alert--success { --el-alert-bg-color: var(--panel-alert-success-bg-color); - --el-color-success: var(--panel-alert-success-text-color);; + --el-color-success: var(--panel-alert-success-text-color); } .el-alert--warning { diff --git a/frontend/src/styles/element.scss b/frontend/src/styles/element.scss index 36998aa79..391647068 100644 --- a/frontend/src/styles/element.scss +++ b/frontend/src/styles/element.scss @@ -25,9 +25,6 @@ --el-color-primary-light-9: var(--panel-color-primary-light-9); --el-text-color-regular: #646a73; - --el-color-success:#238636; - --el-color-success-light-8: #3fb950; - --el-color-success-light-9: #3fb95030; } html { diff --git a/frontend/src/views/app-store/installed/check/index.vue b/frontend/src/views/app-store/installed/check/index.vue index 49cefbc8f..9006d8d2f 100644 --- a/frontend/src/views/app-store/installed/check/index.vue +++ b/frontend/src/views/app-store/installed/check/index.vue @@ -9,7 +9,7 @@ show-icon :closable="false" /> - + - +