github_mirrors/vue-vben-admin
1
0
Fork 0
mirror of https://github.com/vbenjs/vue-vben-admin.git synced 2025-08-27 04:39:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(theme): make sure the menu style is correct, fix #382

Browse Source
This commit is contained in:
Vben
2021-04-10 23:20:29 +08:00
parent 640a2c1798
commit c77f7e62ab
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
build/config/themeConfig.ts
View File

@@ -49,6 +49,8 @@ export function generateColors({
.toRgbString(); .toRgbString();
}); });
const shortAlphaColors = alphaColors.map((item) => item.replace(/\s/g, '').replace(/0\./g, '.'));
const tinycolorLightens = arr const tinycolorLightens = arr
.map((_t, i) => { .map((_t, i) => {
return tinycolor(color) return tinycolor(color)
@@ -64,5 +66,12 @@ export function generateColors({
.toHexString(); .toHexString();
}) })
.filter((item) => item !== '#000000'); .filter((item) => item !== '#000000');
return [...lightens, ...darkens, ...alphaColors, ...tinycolorDarkens, ...tinycolorLightens]; return [
...lightens,
...darkens,
...alphaColors,
...shortAlphaColors,
...tinycolorDarkens,
...tinycolorLightens,
].filter((item) => !item.includes('-'));
} }

2
package.json
View File

@@ -113,7 +113,7 @@
"vite-plugin-pwa": "^0.7.0", "vite-plugin-pwa": "^0.7.0",
"vite-plugin-style-import": "^0.9.2", "vite-plugin-style-import": "^0.9.2",
"vite-plugin-svg-icons": "^0.4.1", "vite-plugin-svg-icons": "^0.4.1",
"vite-plugin-theme": "^0.6.3", "vite-plugin-theme": "^0.6.4",
"vite-plugin-windicss": "0.13.2", "vite-plugin-windicss": "0.13.2",
"vue-eslint-parser": "^7.6.0" "vue-eslint-parser": "^7.6.0"
}, },

8
yarn.lock
View File

@@ -9112,10 +9112,10 @@ vite-plugin-svg-icons@^0.4.1:
svg-baker "1.7.0" svg-baker "1.7.0"
svgo "^2.3.0" svgo "^2.3.0"
vite-plugin-theme@^0.6.3: vite-plugin-theme@^0.6.4:
version "0.6.3" version "0.6.4"
resolved "https://registry.npmjs.org/vite-plugin-theme/-/vite-plugin-theme-0.6.3.tgz#77be00b039eb53452c9adfce7fd90e39a39a81ee" resolved "https://registry.npmjs.org/vite-plugin-theme/-/vite-plugin-theme-0.6.4.tgz#51376c328d708aa30ce56031ff4d7dd02cca613f"
integrity sha512-ffhnqCtCG/0Y7egfiF9upJRo5ZEKS6lQOQsSztqu8gA2/SGsNTm3lsmEWvARMeUAj/8aF5PYzAv5EikfhcPENQ== integrity sha512-GoXSDHjmDNU2R6bmuyr67VqI5dekGSejNMzlGTivMOmNl516464ATmV5NtoCDNiPJ1QYYnMRjZSQNfZ/Fxl7Qg==
dependencies: dependencies:
"@types/node" "^14.14.37" "@types/node" "^14.14.37"
"@types/tinycolor2" "^1.4.2" "@types/tinycolor2" "^1.4.2"