diff --git a/src/layout/components/NavHeader/index.vue b/src/layout/components/NavHeader/index.vue index e4ebb2967..3b60c0003 100644 --- a/src/layout/components/NavHeader/index.vue +++ b/src/layout/components/NavHeader/index.vue @@ -250,7 +250,7 @@ export default { padding-left: 10px !important; &:hover { - background-color: rgba(255, 255, 255, .25); + background-color: rgba(0, 0, 0, .12); } } diff --git a/src/styles/index.scss b/src/styles/index.scss index 37b73ce6f..82fc64aee 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -374,7 +374,7 @@ button, input, optgroup, select, textarea { } .el-tabs__item > span { - padding: 0 4px; + padding: 0 6px; } .el-form .el-input__inner, .el-dialog__body .el-input__inner { diff --git a/src/utils/theme/color.js b/src/utils/theme/color.js index 1c759de51..09fff6d4f 100644 --- a/src/utils/theme/color.js +++ b/src/utils/theme/color.js @@ -91,7 +91,7 @@ export function changeMenuColor(themeColors) { const currentColor = colors[key] elementStyle.setProperty(key, currentColor) - if (key.includes('--color')) { + if (key === '--color-primary') { for (const [i, light] of lights.entries()) { const color = mix(white, currentColor.replace(/#/g, ''), light) elementStyle.setProperty(key + '-light' + '-' + i, color) @@ -100,6 +100,9 @@ export function changeMenuColor(themeColors) { const color = mix(black, currentColor.replace(/#/g, ''), dark) elementStyle.setProperty(key + '-dark' + '-' + i, color) } + } + + if (key.includes('--color')) { const lightColor = mix(white, currentColor.replace(/#/g, ''), 70) const darkColor = mix(black, currentColor.replace(/#/g, ''), 70) elementStyle.setProperty(key + '-light', lightColor) diff --git a/src/views/assets/Asset/AssetList/index.vue b/src/views/assets/Asset/AssetList/index.vue index 106df43fb..a95a8f772 100644 --- a/src/views/assets/Asset/AssetList/index.vue +++ b/src/views/assets/Asset/AssetList/index.vue @@ -63,7 +63,7 @@ export default { component: () => import('@/views/assets/Asset/AssetList/GPTList.vue') }, { - icon: 'fa-th', + icon: 'fa-cube', name: 'custom', hidden: true, component: () => import('@/views/assets/Asset/AssetList/CustomList.vue') diff --git a/src/views/assets/Platform/PlatformList.vue b/src/views/assets/Platform/PlatformList.vue index dd346f685..0bd0cbef4 100644 --- a/src/views/assets/Platform/PlatformList.vue +++ b/src/views/assets/Platform/PlatformList.vue @@ -152,7 +152,7 @@ export default { cloud: 'fa-cloud', web: 'fa-globe', gpt: 'fa-comment', - custom: 'fa-th' + custom: 'fa-cube' } const state = await this.$store.dispatch('assets/getAssetCategories') for (const item of state.assetCategories) { diff --git a/yarn.lock b/yarn.lock index 5cb91bdb0..6c32c4f53 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2751,13 +2751,13 @@ "resolved" "https://registry.npmmirror.com/bn.js/-/bn.js-5.2.1.tgz" "version" "5.2.1" -"body-parser@1.20.1": - "integrity" "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==" - "resolved" "https://registry.npmmirror.com/body-parser/-/body-parser-1.20.1.tgz" - "version" "1.20.1" +"body-parser@1.20.2": + "integrity" "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==" + "resolved" "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz" + "version" "1.20.2" dependencies: "bytes" "3.1.2" - "content-type" "~1.0.4" + "content-type" "~1.0.5" "debug" "2.6.9" "depd" "2.0.0" "destroy" "1.2.0" @@ -2765,7 +2765,7 @@ "iconv-lite" "0.4.24" "on-finished" "2.4.1" "qs" "6.11.0" - "raw-body" "2.5.1" + "raw-body" "2.5.2" "type-is" "~1.6.18" "unpipe" "1.0.0" @@ -2976,7 +2976,7 @@ "bytes@3.1.2": "integrity" "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==" - "resolved" "https://registry.npmmirror.com/bytes/-/bytes-3.1.2.tgz" + "resolved" "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz" "version" "3.1.2" "cacache@^10.0.4": @@ -3744,9 +3744,9 @@ dependencies: "safe-buffer" "5.2.1" -"content-type@~1.0.4": +"content-type@~1.0.4", "content-type@~1.0.5": "integrity" "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==" - "resolved" "https://registry.npmmirror.com/content-type/-/content-type-1.0.5.tgz" + "resolved" "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz" "version" "1.0.5" "convert-source-map@^1.4.0", "convert-source-map@^1.5.1", "convert-source-map@^1.7.0": @@ -3764,10 +3764,10 @@ "resolved" "https://registry.npmmirror.com/cookie-signature/-/cookie-signature-1.0.6.tgz" "version" "1.0.6" -"cookie@0.5.0": - "integrity" "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==" - "resolved" "https://registry.npmmirror.com/cookie/-/cookie-0.5.0.tgz" - "version" "0.5.0" +"cookie@0.6.0": + "integrity" "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==" + "resolved" "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz" + "version" "0.6.0" "copy-anything@^2.0.1": "integrity" "sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==" @@ -5362,16 +5362,16 @@ "jest-regex-util" "^23.3.0" "express@^4.16.3", "express@^4.17.1": - "integrity" "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==" - "resolved" "https://registry.npmmirror.com/express/-/express-4.18.2.tgz" - "version" "4.18.2" + "integrity" "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==" + "resolved" "https://registry.npmjs.org/express/-/express-4.19.2.tgz" + "version" "4.19.2" dependencies: "accepts" "~1.3.8" "array-flatten" "1.1.1" - "body-parser" "1.20.1" + "body-parser" "1.20.2" "content-disposition" "0.5.4" "content-type" "~1.0.4" - "cookie" "0.5.0" + "cookie" "0.6.0" "cookie-signature" "1.0.6" "debug" "2.6.9" "depd" "2.0.0" @@ -5644,11 +5644,11 @@ "unpipe" "~1.0.0" "find-babel-config@^1.1.0": - "integrity" "sha512-jB2CHJeqy6a820ssiqwrKMeyC6nNdmrcgkKWJWmpoxpE8RKciYJXCcXRq1h2AzCo5I5BJeN2tkGEO3hLTuePRA==" - "resolved" "https://registry.npmmirror.com/find-babel-config/-/find-babel-config-1.2.0.tgz" - "version" "1.2.0" + "integrity" "sha512-mP4klVCAYHgRyY2TNSfgk8RSVvpFx5Ug0p9Bca0c5lTk1lUS5p/UcCqvIUdSPtUJgf2syBsdPGTKqTd5NjC5gg==" + "resolved" "https://registry.npmjs.org/find-babel-config/-/find-babel-config-1.2.1.tgz" + "version" "1.2.1" dependencies: - "json5" "^0.5.1" + "json5" "^2.2.3" "path-exists" "^3.0.0" "find-cache-dir@^0.1.1": @@ -5772,9 +5772,9 @@ "readable-stream" "^2.3.6" "follow-redirects@^1.0.0", "follow-redirects@^1.10.0": - "integrity" "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==" - "resolved" "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.3.tgz" - "version" "1.15.3" + "integrity" "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==" + "resolved" "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz" + "version" "1.15.6" "for-each@^0.3.3": "integrity" "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==" @@ -6856,9 +6856,9 @@ "version" "4.3.0" "ip@^1.1.0", "ip@^1.1.5": - "integrity" "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==" - "resolved" "https://registry.npmmirror.com/ip/-/ip-1.1.8.tgz" - "version" "1.1.8" + "integrity" "sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ==" + "resolved" "https://registry.npmjs.org/ip/-/ip-1.1.9.tgz" + "version" "1.1.9" "ipaddr.js@^1.9.0", "ipaddr.js@1.9.1": "integrity" "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==" @@ -8037,7 +8037,7 @@ "json5@^2.1.2", "json5@^2.2.3": "integrity" "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==" - "resolved" "https://registry.npmmirror.com/json5/-/json5-2.2.3.tgz" + "resolved" "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz" "version" "2.2.3" "json5@^2.2.1": @@ -8084,9 +8084,9 @@ "version" "3.1.1" "katex@^0.16.0": - "integrity" "sha512-fsSYjWS0EEOwvy81j3vRA8TEAhQhKiqO+FQaKWp0m39qwOzHVBgAUBIXWj1pB+O2W3fIpNa6Y9KSKCVbfPhyAQ==" - "resolved" "https://registry.npmmirror.com/katex/-/katex-0.16.9.tgz" - "version" "0.16.9" + "integrity" "sha512-ZiqaC04tp2O5utMsl2TEZTXxa6WSC4yo0fv5ML++D3QZv/vx2Mct0mTlRx3O+uUkjfuAgOkzsCmq5MiUEsDDdA==" + "resolved" "https://registry.npmjs.org/katex/-/katex-0.16.10.tgz" + "version" "0.16.10" dependencies: "commander" "^8.3.0" @@ -8845,7 +8845,7 @@ "media-typer@0.3.0": "integrity" "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==" - "resolved" "https://registry.npmmirror.com/media-typer/-/media-typer-0.3.0.tgz" + "resolved" "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz" "version" "0.3.0" "mem@^4.0.0": @@ -11094,7 +11094,7 @@ "qs@6.11.0": "integrity" "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==" - "resolved" "https://registry.npmmirror.com/qs/-/qs-6.11.0.tgz" + "resolved" "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz" "version" "6.11.0" dependencies: "side-channel" "^1.0.4" @@ -11155,10 +11155,10 @@ "resolved" "https://registry.npmmirror.com/range-parser/-/range-parser-1.2.1.tgz" "version" "1.2.1" -"raw-body@2.5.1": - "integrity" "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==" - "resolved" "https://registry.npmmirror.com/raw-body/-/raw-body-2.5.1.tgz" - "version" "2.5.1" +"raw-body@2.5.2": + "integrity" "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==" + "resolved" "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz" + "version" "2.5.2" dependencies: "bytes" "3.1.2" "http-errors" "2.0.0" @@ -12894,9 +12894,9 @@ "version" "1.1.3" "tar@^6.0.2": - "integrity" "sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==" - "resolved" "https://registry.npmmirror.com/tar/-/tar-6.2.0.tgz" - "version" "6.2.0" + "integrity" "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==" + "resolved" "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz" + "version" "6.2.1" dependencies: "chownr" "^2.0.0" "fs-minipass" "^2.0.0" @@ -13174,7 +13174,7 @@ "type-is@~1.6.18": "integrity" "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==" - "resolved" "https://registry.npmmirror.com/type-is/-/type-is-1.6.18.tgz" + "resolved" "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz" "version" "1.6.18" dependencies: "media-typer" "0.3.0"