From 26e3698f57a2986f3b727fa38f293ca40c89f3ab Mon Sep 17 00:00:00 2001 From: nsnail Date: Tue, 12 Nov 2024 10:33:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20--el-color-primary=20?= =?UTF-8?q?=E5=8F=98=E9=87=8F=E6=9C=89=E9=97=AA=E7=83=81=E7=8E=B0=E8=B1=A1?= =?UTF-8?q?=20(#194)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: tk --- .../AdmSettings.json | 5 +- src/frontend/admin/package.json | 6 +- src/frontend/admin/src/assets/img/logo.svg | 48 +-- .../admin/src/assets/img/no-widgets.svg | 74 ++-- src/frontend/admin/src/assets/img/ver.svg | 340 +++++++++--------- .../src/components/naVersionUpdater/index.vue | 4 +- .../admin/src/components/scCron/index.vue | 2 +- .../admin/src/components/scDialog/index.vue | 2 +- .../src/components/scFileSelect/index.vue | 2 +- .../admin/src/components/scFilterBar/my.vue | 2 +- .../src/components/scIconSelect/index.vue | 4 +- .../components/scMini/scStatusIndicator.vue | 2 +- .../src/components/scPageHeader/index.vue | 2 +- .../src/components/scSelectFilter/index.vue | 4 +- .../admin/src/layout/components/search.vue | 4 +- .../admin/src/layout/components/sideM.vue | 4 +- .../admin/src/layout/components/tasks.vue | 4 +- src/frontend/admin/src/layout/index.vue | 2 +- src/frontend/admin/src/style/app.scss | 15 +- src/frontend/admin/src/style/fix.scss | 10 +- src/frontend/admin/src/style/pages.scss | 4 +- src/frontend/admin/src/views/guest/login.vue | 4 +- .../home/widgets/components/change-log.vue | 2 +- .../admin/src/views/home/widgets/index.vue | 10 +- .../src/views/home/work/components/myapp.vue | 4 +- 25 files changed, 282 insertions(+), 278 deletions(-) diff --git a/src/backend/NetAdmin.AdmServer.Infrastructure/AdmSettings.json b/src/backend/NetAdmin.AdmServer.Infrastructure/AdmSettings.json index cac780d7..20a33ad6 100644 --- a/src/backend/NetAdmin.AdmServer.Infrastructure/AdmSettings.json +++ b/src/backend/NetAdmin.AdmServer.Infrastructure/AdmSettings.json @@ -3,14 +3,15 @@ "SpecificationDocumentSettings": { "GroupOpenApiInfos": [ { + "Description": "NetAdmin - 系统组件", "Group": "Sys", + "TermsOfService": "https://github.com/nsnail/NetAdmin", "Title": "系统组件", - "Description": "NetAdmin - 系统组件" }, { + "Description": "NetAdmin - 管理服务", "Group": "Adm", "Title": "管理服务", - "Description": "NetAdmin - 管理服务" }, { "Group": "Tpl", diff --git a/src/frontend/admin/package.json b/src/frontend/admin/package.json index 08c85439..10b2c3c0 100644 --- a/src/frontend/admin/package.json +++ b/src/frontend/admin/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@element-plus/icons-vue": "2.3.1", - "ace-builds": "1.36.3", + "ace-builds": "1.36.4", "aieditor": "1.2.5", "axios": "1.7.7", "clipboard": "2.0.11", @@ -37,12 +37,12 @@ "vuex": "4.1.0" }, "devDependencies": { - "@vitejs/plugin-vue": "5.1.4", + "@vitejs/plugin-vue": "5.1.5", "prettier": "3.3.3", "prettier-plugin-organize-attributes": "1.0.0", "sass": "1.80.6", "terser": "5.36.0", - "vite": "5.4.10" + "vite": "5.4.11" }, "browserslist": [ "> 1%", diff --git a/src/frontend/admin/src/assets/img/logo.svg b/src/frontend/admin/src/assets/img/logo.svg index 5a88fa32..67773370 100644 --- a/src/frontend/admin/src/assets/img/logo.svg +++ b/src/frontend/admin/src/assets/img/logo.svg @@ -3,45 +3,45 @@ - + - + - + + s0.2,0,0.3,0c0.9,0,1.8-0.3,2.5-0.9c0.7-0.6,1.2-1.6,1.6-2.8c0.4,1.2,0.4,2.6-0.4,3.8c-0.8,1.2-2.3,1.9-3.7,1.9c-0.2,0-0.3,0-0.5,0 + c-0.2,0-0.3,0-0.5-0.1c-0.4-0.1-0.7-0.2-1.1-0.3c-0.7-0.3-1.3-0.8-1.6-1.5C-23.3-3.3-23.2-4.9-22.4-5.9" /> + C-8.1-6.4-5.1,2.2-3.4,7c1.6,6.3,4.7,12,9.8,13.5C8.6,21,9,18.8,9,18.8c1.4,2,4.3,3.4,6.9,2.7C25.6,18.7,26.9,10.2,26.9,10.2" /> - + - + - + - + c-1.4-2-1.9-4.7-1.6-7.1c0.3-2.4,1.4-4.8,3.1-6.6c0.9-0.9,1.9-1.7,3.2-2.1C20.6-6.3,22-6.4,23.3-6c1.4,0.4,2.5,1.4,3.1,2.5 + C27-2.3,27.3-1,27.2,0.2c-0.1,1.3-0.5,2.6-1.5,3.5c-0.9,1-2.5,1.5-3.8,0.8S20,2.5,20.3,1.1c0.2-0.7,0.6-1.2,1.2-1.5 + c0.3-0.1,0.7-0.2,1,0c0.3,0.1,0.5,0.3,0.7,0.6c-1-0.9-2,0.3-2.1,1.1c-0.1,0.9,0.5,1.9,1.3,2.2c0.4,0.2,0.8,0.1,1.3,0 + c0.4-0.1,0.8-0.4,1.1-0.7c0.6-0.7,0.9-1.7,0.9-2.7s-0.2-2-0.7-2.8s-1.2-1.4-2.1-1.6c-1.8-0.5-3.8,0.4-5.2,1.9 + C14.9,0.5,14,5.5,16.1,9.1c1,1.8,2.7,3.3,4.8,3.4C23,12.6,25.2,11.5,26.9,10.2" /> + diff --git a/src/frontend/admin/src/assets/img/no-widgets.svg b/src/frontend/admin/src/assets/img/no-widgets.svg index 3288ed7f..bd6c6a57 100644 --- a/src/frontend/admin/src/assets/img/no-widgets.svg +++ b/src/frontend/admin/src/assets/img/no-widgets.svg @@ -3,55 +3,55 @@ - + - + + c0,0.3,0,0.6,0,0.9c-1.6-0.6-3.4-1-5.2-1c-8.3-0.1-15.1,6.6-15.2,15c-0.1,8.2,6.4,14.9,14.5,15.2l0,0l44.6,0.3 + c8.3,0.1,15.1-6.6,15.2-15S225.2,227.5,216.9,227.4z" /> + c0,0.3,0,0.6,0,0.9c-1.6-0.6-3.4-1-5.2-1c-8.3-0.1-15.1,6.6-15.2,15c-0.1,8.2,6.4,14.9,14.5,15.2l0,0l44.6,0.3 + c8.3,0.1,15.1-6.6,15.2-15S604.7,194.3,596.4,194.2z" /> - - + + - + l0.5-65.2C571.5,504.3,572.2,503.1,572.3,501.7z" /> + - - - - - + + + + + - - - - - + + + + + + c0,5.6-0.1,11.2-0.1,16.5l-0.1-0.1l65.8,0.6l19.5,0.1l5.3,0l0,0l-5.3,0l-19.5-0.1l-65.8-0.3l-0.3,0l0.1-16.8l0.1,0l92.3,0.8 + l0.1,0l0,0.1c0,5.3-0.1,9.4-0.1,12.2c0,1.5,0,2.5,0,3.2l0,0.7C577.1,526.8,577.1,527,577.1,527z" /> - - + l0.1-0.1c0,5.6-0.1,11.2-0.1,16.5l-0.1-0.1l65.8,0.6l19.5,0.1l5.3,0l0,0l-5.3,0l-19.5-0.1l-65.8-0.3l-0.3,0l0.1-16.7l0.1,0 + l92.3,0.8l0.1,0l0,0.1c0,5.3-0.1,9.4-0.1,12.2c0,1.5,0,2.5,0,3.2l0,0.7C576.9,552.3,576.9,552.5,576.9,552.5z" /> + + \ No newline at end of file diff --git a/src/frontend/admin/src/assets/img/ver.svg b/src/frontend/admin/src/assets/img/ver.svg index f75f0448..7ef2f7f1 100644 --- a/src/frontend/admin/src/assets/img/ver.svg +++ b/src/frontend/admin/src/assets/img/ver.svg @@ -3,236 +3,236 @@ 升级中 - + - - + - + - - + - + + V29.3C383.4,27.8,382.2,26.6,380.7,26.7z M328.3,147c0,0.5-0.4,0.9-0.9,0.9c0,0,0,0,0,0h-3.6c-0.5,0-0.9-0.4-0.9-0.8c0,0,0,0,0,0 + v-19.7c0-0.5,0.4-0.9,0.9-0.9c0,0,0,0,0,0h3.6c0.5,0,0.9,0.4,0.9,0.9c0,0,0,0,0,0V147z M328.3,116.8c0,0.5-0.4,0.9-0.9,0.9 + c0,0,0,0,0,0h-3.6c-0.5,0-0.9-0.4-0.9-0.9c0,0,0,0,0,0V97c0-0.5,0.4-0.9,0.9-0.9c0,0,0,0,0,0h3.6c0.5,0,0.9,0.4,0.9,0.9 + c0,0,0,0,0,0V116.8z M328.3,86.5c0,0.5-0.4,0.9-0.9,0.9c0,0,0,0,0,0h-3.6c-0.5,0-0.9-0.4-0.9-0.9c0,0,0,0,0,0V66.8 + c0-0.5,0.4-0.9,0.9-0.9c0,0,0,0,0,0h3.6c0.5,0,0.9,0.4,0.9,0.9c0,0,0,0,0,0V86.5z M328.3,56.3c0,0.5-0.4,0.9-0.9,0.9c0,0,0,0,0,0 + h-3.6c-0.5,0-0.9-0.4-0.9-0.9c0,0,0,0,0,0V36.6c0-0.5,0.4-0.9,0.9-0.9c0,0,0,0,0,0h3.6c0.5,0,0.9,0.4,0.9,0.9c0,0,0,0,0,0V56.3z + M340,147c0,0.5-0.4,0.9-0.9,0.9c0,0,0,0,0,0h-3.6c-0.5,0-0.9-0.4-0.9-0.9c0,0,0,0,0,0v-19.7c0-0.5,0.4-0.9,1-0.9h3.6 + c0.5,0,0.9,0.4,0.9,0.9V147z M340,116.8c0,0.5-0.4,0.9-0.9,0.9h-3.6c-0.5,0-0.9-0.4-1-0.9V97c0-0.5,0.4-0.9,1-0.9h3.6 + c0.5,0,0.9,0.4,0.9,0.9V116.8z M340,86.5c0,0.5-0.4,0.9-0.9,0.9h-3.6c-0.5,0-0.9-0.4-1-0.9V66.8c0-0.5,0.4-0.9,1-0.9h3.6 + c0.5,0,0.9,0.4,0.9,0.9V86.5z M340,56.3c0,0.5-0.4,0.9-0.9,0.9h-3.6c-0.5,0-0.9-0.4-1-0.9V36.6c0-0.5,0.4-0.9,1-0.9h3.6 + c0.5,0,0.9,0.4,0.9,0.9V56.3z M351.7,147c0,0.5-0.4,0.9-0.9,0.9c0,0,0,0,0,0h-3.6c-0.5,0-0.9-0.4-0.9-0.9c0,0,0,0,0,0v-19.7 + c0-0.5,0.4-0.9,0.9-0.9h3.6c0.5,0,0.9,0.4,0.9,0.9V147z M351.7,116.8c0,0.5-0.4,0.9-0.9,0.9h-3.6c-0.5,0-0.9-0.4-0.9-0.9V97 + c0-0.5,0.4-0.9,0.9-0.9h3.6c0.5,0,0.9,0.4,0.9,0.9V116.8z M351.7,86.5c0,0.5-0.4,0.9-0.9,0.9h-3.6c-0.5,0-0.9-0.4-0.9-0.9V66.8 + c0-0.5,0.4-0.9,0.9-0.9h3.6c0.5,0,0.9,0.4,0.9,0.9V86.5z M351.7,56.3c0,0.5-0.4,0.9-0.9,0.9h-3.6c-0.5,0-0.9-0.4-0.9-0.9V36.6 + c0-0.5,0.4-0.9,0.9-0.9h3.6c0.5,0,0.9,0.4,0.9,0.9V56.3z M363.4,147c0,0.5-0.4,0.9-0.9,0.9c0,0,0,0,0,0h-3.6 + c-0.5,0-0.9-0.4-0.9-0.9c0,0,0,0,0,0v-19.7c0-0.5,0.4-0.9,0.9-0.9h3.6c0.5,0,0.9,0.4,0.9,0.9V147z M363.4,116.8 + c0,0.5-0.4,0.9-0.9,0.9h-3.6c-0.5,0-0.9-0.4-0.9-0.9V97c0-0.5,0.4-0.9,0.9-0.9h3.6c0.5,0,0.9,0.4,0.9,0.9V116.8z M363.4,86.5 + c0,0.5-0.4,0.9-0.9,0.9h-3.6c-0.5,0-0.9-0.4-0.9-0.9V66.8c0-0.5,0.4-0.9,0.9-0.9h3.6c0.5,0,0.9,0.4,0.9,0.9V86.5z M363.4,56.3 + c0,0.5-0.4,0.9-0.9,0.9h-3.6c-0.5,0-0.9-0.4-0.9-0.9V36.6c0-0.5,0.4-0.9,0.9-0.9h3.6c0.5,0,0.9,0.4,0.9,0.9V56.3z M375.1,147 + c0,0.5-0.4,0.9-0.9,0.9c0,0,0,0,0,0h-3.6c-0.5,0-0.9-0.4-0.9-0.9c0,0,0,0,0,0v-19.7c0-0.5,0.4-0.9,0.9-0.9h3.6 + c0.5,0,0.9,0.4,1,0.9V147z M375.1,116.8c0,0.5-0.4,0.9-1,0.9h-3.6c-0.5,0-0.9-0.4-0.9-0.9V97c0-0.5,0.4-0.9,0.9-0.9h3.6 + c0.5,0,0.9,0.4,1,0.9V116.8z M375.1,86.5c0,0.5-0.4,0.9-1,0.9h-3.6c-0.5,0-0.9-0.4-0.9-0.9V66.8c0-0.5,0.4-0.9,0.9-0.9h3.6 + c0.5,0,0.9,0.4,1,0.9V86.5z M375.1,56.3c0,0.5-0.4,0.9-1,0.9h-3.6c-0.5,0-0.9-0.4-0.9-0.9V36.6c0-0.5,0.4-0.9,0.9-0.9h3.6 + c0.5,0,0.9,0.4,1,0.9V56.3z" /> - + - + + V58.2C233.9,56.7,232.6,55.5,231.1,55.6z M182.5,159.4c0,0.6-0.6,1.1-1.2,1.1h-5.4c-0.6,0-1.2-0.5-1.2-1.1v-5.2 + c0-0.6,0.6-1.1,1.2-1.1c0,0,0,0,0,0h5.4c0.6,0,1.2,0.5,1.2,1.1c0,0,0,0,0,0V159.4z M182.5,146.5c0,0.6-0.6,1.1-1.2,1.1 + c0,0,0,0,0,0h-5.4c-0.6,0-1.2-0.5-1.2-1.1c0,0,0,0,0,0v-5.2c0-0.6,0.6-1.1,1.2-1.1h5.4c0.6,0,1.2,0.5,1.2,1.1V146.5z + M182.5,133.6c0,0.6-0.6,1.1-1.2,1.1h-5.4c-0.6,0-1.2-0.5-1.2-1.1v-5.2c0-0.6,0.6-1.1,1.2-1.1c0,0,0,0,0,0h5.4 + c0.6,0,1.2,0.5,1.2,1.1c0,0,0,0,0,0V133.6z M182.5,120.7c0,0.6-0.6,1.1-1.2,1.1c0,0,0,0,0,0h-5.4c-0.6,0-1.2-0.5-1.2-1.1 + c0,0,0,0,0,0v-5.2c0-0.6,0.6-1.1,1.2-1.1h5.4c0.6,0,1.2,0.5,1.2,1.1V120.7z M182.5,107.8c0,0.6-0.6,1.1-1.2,1.1h-5.4 + c-0.6,0-1.2-0.5-1.2-1.1v-5.2c0-0.6,0.6-1.1,1.2-1.1c0,0,0,0,0,0h5.4c0.6,0,1.2,0.5,1.2,1.1c0,0,0,0,0,0V107.8z M182.5,94.9 + c0,0.6-0.6,1.1-1.2,1.1c0,0,0,0,0,0h-5.4c-0.6,0-1.2-0.5-1.2-1.1c0,0,0,0,0,0v-5.2c0-0.6,0.6-1.1,1.2-1.1h5.4 + c0.6,0,1.2,0.5,1.2,1.1V94.9z M182.5,82.1c0,0.6-0.6,1.1-1.2,1.1h-5.4c-0.6,0-1.2-0.5-1.2-1.1v-5.2c0-0.6,0.6-1.1,1.2-1.1 + c0,0,0,0,0,0h5.4c0.6,0,1.2,0.5,1.2,1.1c0,0,0,0,0,0V82.1z M182.5,69.2c0,0.6-0.6,1.1-1.2,1.1c0,0,0,0,0,0h-5.4 + c-0.6,0-1.2-0.5-1.2-1.1c0,0,0,0,0,0V64c0-0.6,0.6-1.1,1.2-1.1h5.4c0.6,0,1.2,0.5,1.2,1.1V69.2z M192.6,159.4 + c0,0.6-0.6,1.1-1.2,1.1H186c-0.6,0-1.2-0.5-1.2-1.1c0,0,0,0,0,0v-5.2c0-0.6,0.6-1.1,1.2-1.1h5.4c0.6,0,1.2,0.5,1.2,1.1 + c0,0,0,0,0,0L192.6,159.4z M192.6,146.5c0,0.6-0.6,1.1-1.2,1.1c0,0,0,0,0,0H186c-0.6,0-1.2-0.5-1.2-1.1v-5.2 + c0-0.6,0.6-1.1,1.2-1.1c0,0,0,0,0,0h5.4c0.6,0,1.2,0.5,1.2,1.1L192.6,146.5z M192.6,133.6c0,0.6-0.6,1.1-1.2,1.1H186 + c-0.6,0-1.2-0.5-1.2-1.1c0,0,0,0,0,0v-5.2c0-0.6,0.6-1.1,1.2-1.1h5.4c0.6,0,1.2,0.5,1.2,1.1c0,0,0,0,0,0L192.6,133.6z + M192.6,120.7c0,0.6-0.6,1.1-1.2,1.1c0,0,0,0,0,0H186c-0.6,0-1.2-0.5-1.2-1.1v-5.2c0-0.6,0.6-1.1,1.2-1.1c0,0,0,0,0,0h5.4 + c0.6,0,1.2,0.5,1.2,1.1L192.6,120.7z M192.6,107.8c0,0.6-0.6,1.1-1.2,1.1H186c-0.6,0-1.2-0.5-1.2-1.1c0,0,0,0,0,0v-5.2 + c0-0.6,0.6-1.1,1.2-1.1c0,0,0,0,0,0h5.4c0.6,0,1.2,0.5,1.2,1.1c0,0,0,0,0,0L192.6,107.8z M192.6,94.9c0,0.6-0.6,1.1-1.2,1.1 + c0,0,0,0,0,0H186c-0.6,0-1.2-0.5-1.2-1.1v-5.2c0-0.6,0.6-1.1,1.2-1.1c0,0,0,0,0,0h5.4c0.6,0,1.2,0.5,1.2,1.1L192.6,94.9z + M192.6,82.1c0,0.6-0.6,1.1-1.2,1.1H186c-0.6,0-1.2-0.5-1.2-1.1c0,0,0,0,0,0v-5.2c0-0.6,0.6-1.1,1.2-1.1c0,0,0,0,0,0h5.4 + c0.6,0,1.2,0.5,1.2,1.1c0,0,0,0,0,0L192.6,82.1z M192.6,69.2c0,0.6-0.6,1.1-1.2,1.1c0,0,0,0,0,0H186c-0.6,0-1.2-0.5-1.2-1.1V64 + c0-0.6,0.5-1.2,1.2-1.2c0,0,0,0,0,0h5.4c0.6,0,1.2,0.5,1.2,1.1L192.6,69.2z M202.6,159.4c0,0.6-0.6,1.1-1.2,1.1c0,0,0,0,0,0H196 + c-0.6,0-1.2-0.5-1.2-1.1v-5.2c0-0.6,0.6-1.1,1.2-1.1c0,0,0,0,0,0h5.4c0.6,0,1.2,0.5,1.2,1.1L202.6,159.4z M202.6,146.5 + c0,0.6-0.6,1.1-1.2,1.1H196c-0.6,0-1.2-0.5-1.2-1.1c0,0,0,0,0,0v-5.2c0-0.6,0.6-1.1,1.2-1.1h5.4c0.6,0,1.2,0.5,1.2,1.1 + c0,0,0,0,0,0L202.6,146.5z M202.6,133.6c0,0.6-0.6,1.1-1.2,1.1c0,0,0,0,0,0H196c-0.6,0-1.2-0.5-1.2-1.1v-5.2 + c0-0.6,0.6-1.1,1.2-1.1c0,0,0,0,0,0h5.4c0.6,0,1.2,0.5,1.2,1.1L202.6,133.6z M202.6,120.7c0,0.6-0.6,1.1-1.2,1.1H196 + c-0.6,0-1.2-0.5-1.2-1.1c0,0,0,0,0,0v-5.2c0-0.6,0.6-1.1,1.2-1.1h5.4c0.6,0,1.2,0.5,1.2,1.1c0,0,0,0,0,0L202.6,120.7z + M202.6,107.8c0,0.6-0.6,1.1-1.2,1.1c0,0,0,0,0,0H196c-0.6,0-1.2-0.5-1.2-1.1v-5.2c0-0.6,0.6-1.1,1.2-1.1c0,0,0,0,0,0h5.4 + c0.6,0,1.2,0.5,1.2,1.1c0,0,0,0,0,0L202.6,107.8z M202.6,94.9c0,0.6-0.6,1.1-1.2,1.1H196c-0.6,0-1.2-0.5-1.2-1.1c0,0,0,0,0,0 + v-5.2c0-0.6,0.6-1.1,1.2-1.1h5.4c0.6,0,1.2,0.5,1.2,1.1c0,0,0,0,0,0L202.6,94.9z M202.6,82.1c0,0.6-0.6,1.1-1.2,1.1c0,0,0,0,0,0 + H196c-0.6,0-1.2-0.5-1.2-1.1v-5.2c0-0.6,0.6-1.1,1.2-1.1c0,0,0,0,0,0h5.4c0.6,0,1.2,0.5,1.2,1.1c0,0,0,0,0,0L202.6,82.1z + M202.6,69.2c0,0.6-0.6,1.1-1.2,1.1H196c-0.6,0-1.2-0.5-1.2-1.1c0,0,0,0,0,0V64c0-0.6,0.6-1.1,1.2-1.1h5.4c0.6,0,1.2,0.4,1.2,1.1 + c0,0,0,0,0,0V69.2z M227.8,159.4c0,0.6-0.6,1.1-1.2,1.1h-20.5c-0.6,0-1.2-0.5-1.2-1.1v-5.2c0-0.6,0.6-1.1,1.2-1.1c0,0,0,0,0,0 + h20.5c0.6,0,1.2,0.5,1.2,1.1c0,0,0,0,0,0L227.8,159.4z M227.8,146.5c0,0.6-0.6,1.1-1.2,1.1c0,0,0,0,0,0h-20.5 + c-0.6,0-1.2-0.5-1.2-1.1c0,0,0,0,0,0v-5.2c0-0.6,0.6-1.1,1.2-1.1h20.5c0.6,0,1.2,0.5,1.2,1.1L227.8,146.5z M227.8,133.6 + c0,0.6-0.6,1.1-1.2,1.1h-20.5c-0.6,0-1.2-0.5-1.2-1.1v-5.2c0-0.6,0.6-1.1,1.2-1.1c0,0,0,0,0,0h20.5c0.6,0,1.2,0.5,1.2,1.1 + c0,0,0,0,0,0L227.8,133.6z M227.8,120.7c0,0.6-0.6,1.1-1.2,1.1c0,0,0,0,0,0h-20.5c-0.6,0-1.2-0.5-1.2-1.1c0,0,0,0,0,0v-5.2 + c0-0.6,0.6-1.1,1.2-1.1h20.5c0.6,0,1.2,0.5,1.2,1.1L227.8,120.7z M227.8,107.8c0,0.6-0.6,1.1-1.2,1.1h-20.5 + c-0.6,0-1.2-0.5-1.2-1.1v-5.2c0-0.6,0.6-1.1,1.2-1.1c0,0,0,0,0,0h20.5c0.6,0,1.2,0.5,1.2,1.1c0,0,0,0,0,0L227.8,107.8z + M227.8,94.9c0,0.6-0.6,1.1-1.2,1.1c0,0,0,0,0,0h-20.5c-0.6,0-1.2-0.5-1.2-1.1c0,0,0,0,0,0v-5.2c0-0.6,0.6-1.1,1.2-1.1h20.5 + c0.6,0,1.2,0.5,1.2,1.1L227.8,94.9z M227.8,82.1c0,0.6-0.6,1.1-1.2,1.1h-20.5c-0.6,0-1.2-0.5-1.2-1.1v-5.2c0-0.6,0.6-1.1,1.2-1.1 + c0,0,0,0,0,0h20.5c0.6,0,1.2,0.5,1.2,1.1c0,0,0,0,0,0L227.8,82.1z M227.8,69.2c0,0.6-0.6,1.1-1.2,1.1c0,0,0,0,0,0h-20.5 + c-0.6,0-1.2-0.5-1.2-1.1c0,0,0,0,0,0V64c0-0.6,0.6-1.1,1.2-1.1h20.5c0.6,0,1.2,0.5,1.2,1.1L227.8,69.2z" /> - + - + + c1.5,0.1,2.8-1.1,2.8-2.6V29.3C163.9,27.8,162.6,26.6,161.1,26.7z M154.3,161c0,0.6-0.6,1.1-1.2,1.1H92.8c-0.6,0-1.2-0.5-1.2-1.1 + c0,0,0,0,0,0v-5.2c0-0.6,0.6-1.1,1.2-1.1c0,0,0,0,0,0h60.3c0.6,0,1.2,0.5,1.2,1.1c0,0,0,0,0,0V161z M154.3,146.3 + c0,0.6-0.6,1.1-1.2,1.1c0,0,0,0,0,0H92.8c-0.6,0-1.2-0.5-1.2-1.1v-5.2c0-0.6,0.6-1.1,1.2-1.1c0,0,0,0,0,0h60.3 + c0.6,0,1.2,0.5,1.2,1.1V146.3z M154.3,131.6c0,0.6-0.6,1.1-1.2,1.1H92.8c-0.6,0-1.2-0.5-1.2-1.1c0,0,0,0,0,0v-5.2 + c0-0.6,0.6-1.1,1.2-1.1h60.3c0.6,0,1.2,0.5,1.2,1.1c0,0,0,0,0,0V131.6z M154.3,117c0,0.6-0.6,1.1-1.2,1.1H92.8 + c-0.6,0-1.2-0.5-1.2-1.1c0,0,0,0,0,0v-5.2c0-0.6,0.6-1.1,1.2-1.1c0,0,0,0,0,0h60.3c0.6,0,1.2,0.5,1.2,1.1c0,0,0,0,0,0V117z + M154.3,102.3c0,0.6-0.6,1.1-1.2,1.1c0,0,0,0,0,0H92.8c-0.6,0-1.2-0.5-1.2-1.1V97c0-0.6,0.6-1.1,1.2-1.1c0,0,0,0,0,0h60.3 + c0.6,0,1.2,0.5,1.2,1.1V102.3z M154.3,87.6c0,0.6-0.6,1.1-1.2,1.1H92.8c-0.6,0-1.2-0.5-1.2-1.1c0,0,0,0,0,0v-5.3 + c0-0.6,0.6-1.1,1.2-1.1h60.3c0.6,0,1.2,0.5,1.2,1.1c0,0,0,0,0,0V87.6z M154.3,72.9c0,0.6-0.6,1.1-1.2,1.1H92.8 + c-0.6,0-1.2-0.5-1.2-1.1c0,0,0,0,0,0v-5.3c0-0.6,0.6-1.1,1.2-1.1c0,0,0,0,0,0h60.3c0.6,0,1.2,0.5,1.2,1.1c0,0,0,0,0,0V72.9z + M154.3,58.3c0,0.6-0.6,1.1-1.2,1.1c0,0,0,0,0,0H92.8c-0.6,0-1.2-0.5-1.2-1.1V53c0-0.6,0.6-1.1,1.2-1.1c0,0,0,0,0,0h60.3 + c0.6,0,1.2,0.5,1.2,1.1V58.3z M154.3,43.6c0,0.6-0.6,1.1-1.2,1.1H92.8c-0.6,0-1.2-0.5-1.2-1.1c0,0,0,0,0,0v-5.3 + c0-0.6,0.6-1.1,1.2-1.1h60.3c0.6,0,1.2,0.5,1.2,1.1c0,0,0,0,0,0V43.6z" /> - + - + - + c1.4-0.1,2.5-1.2,2.4-2.6V2.6C308.7,1.2,307.6,0.1,306.2,0z M300.4,119.6c0,0.6-0.4,1.1-1,1.1h-51.7c-0.6,0-1-0.5-1-1.1v-5.2 + c0-0.6,0.4-1.1,1-1.1h51.7c0.6,0,1,0.5,1,1.1L300.4,119.6z M300.4,90.3c0,0.6-0.4,1.1-1,1.1h-51.7c-0.6,0-1-0.5-1-1.1V85 + c0-0.6,0.4-1.1,1-1.1h51.7c0.6,0,1,0.5,1,1.1L300.4,90.3z M300.4,60.9c0,0.6-0.4,1.1-1,1.1h-51.7c-0.6,0-1-0.5-1-1.1v-5.2 + c0-0.6,0.4-1.1,1-1.1h51.7c0.6,0,1,0.5,1,1.1L300.4,60.9z M300.4,31.5c0,0.6-0.4,1.1-1,1.1h-51.7c-0.6,0-1-0.5-1-1.1v-5.2 + c0-0.6,0.4-1.1,1-1.1h51.7c0.6,0,1,0.5,1,1.1L300.4,31.5z M300.4,16.9c0,0.6-0.4,1.1-1,1.1h-51.7c-0.6,0-1-0.5-1-1.1v-5.2 + c0-0.6,0.4-1.1,1-1.1h51.7c0.6,0,1,0.5,1,1.1L300.4,16.9z" /> + - + + c-2.6,0-5.2,0.6-7.5,1.7c-0.8-4.2-4.8-7-9-6.2c-2.8,0.5-5,2.5-5.9,5.2c-3.4-2.1-7.7-2-11.1,0.1c-0.4-5.7-4.1-0.8-9.8-0.8 + c-6,0-11.8-4.4-11.8,1.7c0,1.1,0.2,2.2,0.4,3.2c-1.1,0.1-2.1,0.5-3,1c-0.9-7-6.8-12.4-13.9-12.7c22.6-10.3,22.4-44.6,24.8-74.6 + c0.1-1.7,1.2-4.1,1.8-4.4l0,0c1.5,1.1,3.2,1.8,5.1,2.1c-3.2,3.1-5.4,14.3-0.7,20.5c5.3,6.8,1.6,6.9,5.8,14.2 + c-0.9-5,0.8-7.2,6.1-14c4.8-7.2,2.3-18.8-1-20.7c1.8-0.3,3.6-1,5.1-2.1l0,0c0.6,0.3,1.7,2.7,1.8,4.4 + C253.6,164.6,250.4,198.5,280.4,211.9z" /> + c0.7-1.3,1.1-2.8,1.1-4.3c-0.1-4.6-3.9-8.3-8.5-8.2c-4,0.1-7.4,3-8.1,6.9c-0.1,0.4-0.1,0.9-0.1,1.3c0,0.5,0,1,0.1,1.6 + c-3.5-1.4-7.4-1.3-10.8,0.4c-0.7-3.2-3.9-5.3-7.2-4.6c-2,0.4-3.6,1.9-4.3,3.8c-1.3-0.8-2.7-1.2-4.2-1.2c-1.5,0-3.1,0.4-4.4,1.3 + c-0.2-4.6-4.1-8.2-8.7-8s-8.2,4.1-8,8.7l0,0c0,0.8,0.1,1.7,0.3,2.5c-0.8,0.1-1.6,0.4-2.3,0.8c-0.7-5.4-5.2-9.6-10.7-9.8h-0.4 + c-3.4,0-6.7,1.6-8.8,4.3c-3-6.2-10.4-8.9-16.7-5.9c-2.9,1.4-5.2,3.9-6.3,7c4.1,3,6.6,7.8,6.6,12.9c0,2.3-0.5,4.6-1.5,6.6 + c2-2.2,4.8-3.4,7.8-3.4c0.9,0,1.8,0.1,2.7,0.3c-2.9-5-1.2-11.5,3.8-14.4c1.2-0.7,2.6-1.2,3.9-1.3c0.5-0.1,0.9-0.1,1.4-0.1 + c5.8,0,10.6,4.7,10.6,10.6l0,0c0,0.6-0.1,1.3-0.2,1.9c4.4-1.7,9.3-1.6,13.6,0.4c0.9-4.1,4.9-6.7,9-5.8c2.6,0.6,4.7,2.4,5.5,4.9 + c1.6-0.9,3.5-1.4,5.3-1.4c1.9,0,3.8,0.5,5.4,1.5l0.1,0.1c0.3-4.5,3.6-8.4,8-9.4c0.8-0.2,1.7-0.3,2.5-0.3 + c5.8,0,10.6,4.7,10.6,10.6c0,1-0.2,2-0.4,3c1.1,0.1,2.1,0.5,3,1c1-7,7-12.1,14-12.1c1.5,0,3,0.2,4.4,0.7c2.6,0.8,5,2.5,6.7,4.6 + c2.4-4.8,7-8.2,12.4-8.8C311.4,205.9,307.6,203.2,303.3,203.2z" /> - + c-1.4-0.5-2.9-0.7-4.4-0.7c-7,0-13,5.2-14,12.1c-0.9-0.5-1.9-0.9-3-1c0.3-1,0.4-2,0.4-3c0-5.8-4.7-10.5-10.5-10.5 + c-0.8,0-1.7,0.1-2.5,0.3c-4.4,1.1-7.7,4.9-8,9.4l-0.1-0.1c-1.6-1-3.5-1.5-5.4-1.5c-1.9,0-3.7,0.5-5.3,1.4c-1.4-3.9-5.7-6-9.6-4.6 + c-2.5,0.9-4.3,3-4.9,5.5c-4.3-2-9.2-2.1-13.6-0.4c0.1-0.6,0.2-1.3,0.2-1.9c0-5.8-4.7-10.6-10.6-10.6l0,0c-0.5,0-0.9,0-1.4,0.1 + c-5.8,0.8-9.9,6.1-9.1,11.8c0.2,1.4,0.6,2.7,1.3,3.9c-0.9-0.2-1.8-0.3-2.7-0.3c-2.9,0-5.8,1.2-7.8,3.4c1-2.1,1.5-4.3,1.5-6.6 + c0-5.1-2.4-9.9-6.6-12.9l0,0c-7.1-5.2-17-3.6-22.2,3.5c-5.2,7.1-3.6,17,3.5,22.2c6.8,5,16.4,3.7,21.7-2.8 + c-2.1,5.5,0.7,11.6,6.1,13.6c5.5,2.1,11.6-0.7,13.6-6.1c0.5-1.2,0.7-2.5,0.7-3.7c0-1.9,0.4-0.1,0.4,2.7c0,9.7,7.8,17.6,17.5,17.6 + c9.7,0,17.6-7.8,17.6-17.5c0-2.4-0.5-4.8-1.4-7l0.5-0.1c0.5,5.8,5.7,10.1,11.5,9.5c5-0.5,9-4.4,9.5-9.4c1.7,1,3.6,1.6,5.5,1.6 + c0.6,0,1.2,0,1.7-0.1v0.1c0,4.2,3.4,7.6,7.6,7.5c2.6,0,5-1.4,6.4-3.6c4.7,6.3,13.5,7.5,19.8,2.9c1.5-1.1,2.8-2.5,3.7-4.2 + c4.9,7.3,14.8,9.1,22.1,4.2s9.1-14.8,4.2-22.1C324.5,212.5,319.6,209.9,314.4,209.9L314.4,209.9z" /> + + C227.5,75.2,232.7,70,239.1,70z" /> + c-2.2-0.4-4.3-1.3-6.2-2.6c-2.6-1.9-4.2-4.9-4.2-8.1C225.6,135.5,230.7,137.2,239.1,137.2z" /> + c2.4-6.1,3.4-15.9,3.6-31.2C271.5,100.3,288.3,122.4,288.4,151.7z" /> + c-0.2-0.2-0.4-0.4-0.3-0.7C189.7,122.3,206.6,100.2,218.1,96.3L218.1,96.3z" /> + C245.5,93.2,250.7,88,250.7,81.6z M252.9,81.6c0,7.6-6.2,13.8-13.8,13.8c-7.6,0-13.8-6.2-13.8-13.8c0-7.6,6.2-13.8,13.8-13.8 + c0,0,0,0,0,0C246.7,67.8,252.9,74,252.9,81.6z" /> + c0.5-1.3,1-2.7,1.4-4C228.4,46.8,233.4,48.7,239.1,48.7z" /> + c2-2.7,5.8-3.2,8.5-1.2c0.4,0.3,0.8,0.7,1.2,1.2c0.5,0.6,0.9,1.2,1.4,1.9C248.4,33.8,250.9,38.7,252.9,43.8z" /> + s-13.5-1.7-16.6-7.9c-0.3-0.6-0.5-1.1-0.8-1.8c-2.4-6.2-3.4-15.9-3.6-31.1c-0.1-3.4-0.1-7.1-0.1-11.1c-0.1-12.7,1.8-25.4,5.8-37.5 + c3.3,3.3,8.9,5.4,15.3,5.4s11.9-2.1,15.3-5.4c4,12.1,6,24.8,5.8,37.5C260.2,89.2,260.1,92.9,260.1,96.4z M252.9,81.6 + c0-7.6-6.2-13.8-13.8-13.8c-7.6,0-13.8,6.2-13.8,13.8c0,7.6,6.2,13.8,13.8,13.8c0,0,0,0,0,0C246.7,95.4,252.9,89.2,252.9,81.6 + L252.9,81.6z" /> - + - + - + - + - + - + - + - + - + - + - + - + - + \ No newline at end of file diff --git a/src/frontend/admin/src/components/naVersionUpdater/index.vue b/src/frontend/admin/src/components/naVersionUpdater/index.vue index 1832c0b2..a5e4aee9 100644 --- a/src/frontend/admin/src/components/naVersionUpdater/index.vue +++ b/src/frontend/admin/src/components/naVersionUpdater/index.vue @@ -43,7 +43,7 @@ export default { const contents = [] const msg = h('p', { style: 'width:230px;display:flex;justify-content:space-between' }, [ h('span', {}, this.$t('即将开始更新……')), - h('a', { style: 'color:var(--el-color-primary)', href: 'javascript:window.location.reload()' }, this.$t('立即更新')), + h('a', { style: 'color:var(--na-color-primary)', href: 'javascript:window.location.reload()' }, this.$t('立即更新')), ]) const task = h('p', { style: 'font-weight:bold' }, version) const progress = h( @@ -55,7 +55,7 @@ export default { style: { width: '230px', height: '6px', - 'background-color': 'var(--el-color-primary)', + 'background-color': 'var(--na-color-primary)', 'margin-top': '6px', 'border-radius': '6px', }, diff --git a/src/frontend/admin/src/components/scCron/index.vue b/src/frontend/admin/src/components/scCron/index.vue index 54c2124b..bbe62b28 100644 --- a/src/frontend/admin/src/components/scCron/index.vue +++ b/src/frontend/admin/src/components/scCron/index.vue @@ -828,7 +828,7 @@ export default { } .sc-cron:deep(.el-tabs__item.is-active) .sc-cron-num h4 { - background: var(--el-color-primary); + background: var(--na-color-primary); color: #fff; } diff --git a/src/frontend/admin/src/components/scDialog/index.vue b/src/frontend/admin/src/components/scDialog/index.vue index c8e4491e..f695f9e9 100644 --- a/src/frontend/admin/src/components/scDialog/index.vue +++ b/src/frontend/admin/src/components/scDialog/index.vue @@ -97,7 +97,7 @@ export default { } .sc-dialog__headerbtn button:hover .el-dialog__close { - color: var(--el-color-primary); + color: var(--na-color-primary); } .sc-dialog:deep(.el-dialog).is-fullscreen { diff --git a/src/frontend/admin/src/components/scFileSelect/index.vue b/src/frontend/admin/src/components/scFileSelect/index.vue index 316ee053..a91911f9 100644 --- a/src/frontend/admin/src/components/scFileSelect/index.vue +++ b/src/frontend/admin/src/components/scFileSelect/index.vue @@ -440,7 +440,7 @@ export default { } .sc-file-select__item__file .item-file.item-file-doc { - color: var(--el-color-primary); + color: var(--na-color-primary); } .sc-file-select__item__upload { diff --git a/src/frontend/admin/src/components/scFilterBar/my.vue b/src/frontend/admin/src/components/scFilterBar/my.vue index 6ec420de..4c736e3f 100644 --- a/src/frontend/admin/src/components/scFilterBar/my.vue +++ b/src/frontend/admin/src/components/scFilterBar/my.vue @@ -125,7 +125,7 @@ export default { .sc-filter-my-list li:hover { background: #ecf5ff; - color: var(--el-color-primary); + color: var(--na-color-primary); } .sc-filter-my-list li label { diff --git a/src/frontend/admin/src/components/scIconSelect/index.vue b/src/frontend/admin/src/components/scIconSelect/index.vue index 01f94b18..a487dfe3 100644 --- a/src/frontend/admin/src/components/scIconSelect/index.vue +++ b/src/frontend/admin/src/components/scIconSelect/index.vue @@ -185,11 +185,11 @@ export default { } .sc-icon-select__list li:hover { - box-shadow: 0 0 1px 0.3rem var(--el-color-primary); + box-shadow: 0 0 1px 0.3rem var(--na-color-primary); background: var(--el-color-primary-light-9); } .sc-icon-select__list li:hover i { - color: var(--el-color-primary); + color: var(--na-color-primary); } \ No newline at end of file diff --git a/src/frontend/admin/src/components/scMini/scStatusIndicator.vue b/src/frontend/admin/src/components/scMini/scStatusIndicator.vue index 382ed565..b565c7fd 100644 --- a/src/frontend/admin/src/components/scMini/scStatusIndicator.vue +++ b/src/frontend/admin/src/components/scMini/scStatusIndicator.vue @@ -47,7 +47,7 @@ export default { } .sc-state-bg--primary { - background: var(--el-color-primary); + background: var(--na-color-primary); } .sc-state-bg--success { diff --git a/src/frontend/admin/src/components/scPageHeader/index.vue b/src/frontend/admin/src/components/scPageHeader/index.vue index dac90b83..ca28238d 100644 --- a/src/frontend/admin/src/components/scPageHeader/index.vue +++ b/src/frontend/admin/src/components/scPageHeader/index.vue @@ -53,7 +53,7 @@ export default { .sc-page-header__icon span { width: 2.5rem; height: 2.5rem; - background: var(--el-color-primary); + background: var(--na-color-primary); border-radius: 40%; display: flex; align-items: center; diff --git a/src/frontend/admin/src/components/scSelectFilter/index.vue b/src/frontend/admin/src/components/scSelectFilter/index.vue index 43370ef8..91e79b32 100644 --- a/src/frontend/admin/src/components/scSelectFilter/index.vue +++ b/src/frontend/admin/src/components/scSelectFilter/index.vue @@ -180,11 +180,11 @@ export default { } .sc-select-filter__item-options li:hover { - color: var(--el-color-primary); + color: var(--na-color-primary); } .sc-select-filter__item-options li.active { - background: var(--el-color-primary); + background: var(--na-color-primary); color: #fff; font-weight: bold; } diff --git a/src/frontend/admin/src/layout/components/search.vue b/src/frontend/admin/src/layout/components/search.vue index a2df4557..df02788c 100644 --- a/src/frontend/admin/src/layout/components/search.vue +++ b/src/frontend/admin/src/layout/components/search.vue @@ -183,8 +183,8 @@ export default { } .sc-search-result li:hover { - background: var(--el-color-primary); + background: var(--na-color-primary); color: #fff; - border-color: var(--el-color-primary); + border-color: var(--na-color-primary); } \ No newline at end of file diff --git a/src/frontend/admin/src/layout/components/sideM.vue b/src/frontend/admin/src/layout/components/sideM.vue index 5b902e5d..8fd1472f 100644 --- a/src/frontend/admin/src/layout/components/sideM.vue +++ b/src/frontend/admin/src/layout/components/sideM.vue @@ -142,8 +142,8 @@ export default { z-index: 10; width: 4rem; height: 4rem; - background: var(--el-color-primary); - box-shadow: 0 0.2rem 1rem 0 var(--el-color-primary); + background: var(--na-color-primary); + box-shadow: 0 0.2rem 1rem 0 var(--na-color-primary); display: flex; align-items: center; justify-content: center; diff --git a/src/frontend/admin/src/layout/components/tasks.vue b/src/frontend/admin/src/layout/components/tasks.vue index 8f471f87..fde415da 100644 --- a/src/frontend/admin/src/layout/components/tasks.vue +++ b/src/frontend/admin/src/layout/components/tasks.vue @@ -105,7 +105,7 @@ export default { margin-bottom: 0.5rem; } .user-bar-jobs-item:hover { - border-color: var(--el-color-primary); + border-color: var(--na-color-primary); } .user-bar-jobs-item.alert:hover { @@ -124,7 +124,7 @@ export default { display: flex; justify-content: center; align-items: center; - color: var(--el-color-primary); + color: var(--na-color-primary); border-radius: 1.5rem; } .user-bar-jobs-item-body .jobMain { diff --git a/src/frontend/admin/src/layout/index.vue b/src/frontend/admin/src/layout/index.vue index 15867895..6122ef5a 100644 --- a/src/frontend/admin/src/layout/index.vue +++ b/src/frontend/admin/src/layout/index.vue @@ -122,7 +122,7 @@
diff --git a/src/frontend/admin/src/style/app.scss b/src/frontend/admin/src/style/app.scss index b5ed7291..3f506dca 100644 --- a/src/frontend/admin/src/style/app.scss +++ b/src/frontend/admin/src/style/app.scss @@ -1,4 +1,7 @@ /* 全局 */ +:root { + --na-color-primary: #21a675; +} #app, body, html { @@ -92,7 +95,7 @@ textarea { bottom: 10rem; right: 0; z-index: 100; - background: var(--el-color-primary); + background: var(--na-color-primary); display: flex; flex-direction: column; align-items: center; @@ -164,7 +167,7 @@ textarea { } .adminui-header .nav li.active { - color: var(--el-color-primary); + color: var(--na-color-primary); } .adminui-header .user-bar .panel-item:hover { @@ -234,7 +237,7 @@ textarea { } .aminui-side-split li.active { - background: var(--el-color-primary); + background: var(--na-color-primary); color: #fff; } @@ -297,7 +300,7 @@ textarea { } .adminui-side-bottom:hover { - color: var(--el-color-primary); + color: var(--na-color-primary); } .aminui-side.isCollapse { @@ -411,7 +414,7 @@ textarea { } .adminui-tags li.active { - background: var(--el-color-primary); + background: var(--na-color-primary); } .adminui-tags li.active a { @@ -546,7 +549,7 @@ textarea { &:after { content: ''; margin: 2rem 0; - border-bottom: var(--el-color-primary) 1px dashed; + border-bottom: var(--na-color-primary) 1px dashed; display: block; } diff --git a/src/frontend/admin/src/style/fix.scss b/src/frontend/admin/src/style/fix.scss index fe09d2fc..48451e99 100644 --- a/src/frontend/admin/src/style/fix.scss +++ b/src/frontend/admin/src/style/fix.scss @@ -26,7 +26,7 @@ } .el-menu--inline { - --el-menu-active-color: var(--el-color-primary) !important; + --el-menu-active-color: var(--na-color-primary) !important; } .el-form-item--default { @@ -269,7 +269,7 @@ } .aminui-side-split li.active { - background-color: var(--el-color-primary); + background-color: var(--na-color-primary); } .adminui-tags li:hover { @@ -277,7 +277,7 @@ } .adminui-tags li.active { - background-color: var(--el-color-primary) !important; + background-color: var(--na-color-primary) !important; } .contextmenu li:hover { @@ -286,12 +286,12 @@ } .data-box .item-background { - background-color: var(--el-color-primary) !important; + background-color: var(--na-color-primary) !important; } .layout-setting, .diy-grid-setting { - background-color: var(--el-color-primary) !important; + background-color: var(--na-color-primary) !important; } .el-descriptions__body .el-descriptions__table { diff --git a/src/frontend/admin/src/style/pages.scss b/src/frontend/admin/src/style/pages.scss index bd32b6d5..af52fa38 100644 --- a/src/frontend/admin/src/style/pages.scss +++ b/src/frontend/admin/src/style/pages.scss @@ -70,7 +70,7 @@ .common-header-right a { font-size: 1.3rem; - color: var(--el-color-primary); + color: var(--na-color-primary); cursor: pointer; } @@ -107,7 +107,7 @@ } .common-main .link { - color: var(--el-color-primary); + color: var(--na-color-primary); cursor: pointer; } diff --git a/src/frontend/admin/src/views/guest/login.vue b/src/frontend/admin/src/views/guest/login.vue index 91df9cc3..9542db14 100644 --- a/src/frontend/admin/src/views/guest/login.vue +++ b/src/frontend/admin/src/views/guest/login.vue @@ -166,7 +166,7 @@ export default { } .login-form:deep(.login-forgot) a { - color: var(--el-color-primary); + color: var(--na-color-primary); } .login-form:deep(.login-forgot) a:hover { @@ -179,7 +179,7 @@ export default { } .login-form:deep(.login-reg) a { - color: var(--el-color-primary); + color: var(--na-color-primary); } .login-form:deep(.login-reg) a:hover { diff --git a/src/frontend/admin/src/views/home/widgets/components/change-log.vue b/src/frontend/admin/src/views/home/widgets/components/change-log.vue index fc889a02..b2918955 100644 --- a/src/frontend/admin/src/views/home/widgets/components/change-log.vue +++ b/src/frontend/admin/src/views/home/widgets/components/change-log.vue @@ -44,7 +44,7 @@ export default { display: none; } a { - color: var(--el-color-primary); + color: var(--na-color-primary); } } \ No newline at end of file diff --git a/src/frontend/admin/src/views/home/widgets/index.vue b/src/frontend/admin/src/views/home/widgets/index.vue index 9ae86258..d3719c74 100644 --- a/src/frontend/admin/src/views/home/widgets/index.vue +++ b/src/frontend/admin/src/views/home/widgets/index.vue @@ -330,7 +330,7 @@ export default { } .customizing .widgets-wrapper .draggable-box { - border: 1px dashed var(--el-color-primary); + border: 1px dashed var(--na-color-primary); padding: 1rem; } @@ -359,7 +359,7 @@ export default { } .customize-overlay label { - background: var(--el-color-primary); + background: var(--na-color-primary); color: #fff; height: 4rem; padding: 0 3rem; @@ -466,15 +466,15 @@ export default { } .selectLayout-item:hover { - border-color: var(--el-color-primary); + border-color: var(--na-color-primary); } .selectLayout-item.active { - border-color: var(--el-color-primary); + border-color: var(--na-color-primary); } .selectLayout-item.active span { - background: var(--el-color-primary); + background: var(--na-color-primary); } .dark { diff --git a/src/frontend/admin/src/views/home/work/components/myapp.vue b/src/frontend/admin/src/views/home/work/components/myapp.vue index 4b09d4ad..597c6ceb 100644 --- a/src/frontend/admin/src/views/home/work/components/myapp.vue +++ b/src/frontend/admin/src/views/home/work/components/myapp.vue @@ -178,8 +178,8 @@ export default { .modItem-add:hover, .modItem-add:hover i { - border-color: var(--el-color-primary); - color: var(--el-color-primary) !important; + border-color: var(--na-color-primary); + color: var(--na-color-primary) !important; } .setMods {