diff --git a/build/config/themeConfig.ts b/build/config/themeConfig.ts index 0df3df450621fdcec77a379466dcc2eed76b32b6..880672b607ccec229acd20b121b47f122bc65852 100644 --- a/build/config/themeConfig.ts +++ b/build/config/themeConfig.ts @@ -49,6 +49,8 @@ export function generateColors({ .toRgbString(); }); + const shortAlphaColors = alphaColors.map((item) => item.replace(/\s/g, '').replace(/0\./g, '.')); + const tinycolorLightens = arr .map((_t, i) => { return tinycolor(color) @@ -64,5 +66,12 @@ export function generateColors({ .toHexString(); }) .filter((item) => item !== '#000000'); - return [...lightens, ...darkens, ...alphaColors, ...tinycolorDarkens, ...tinycolorLightens]; + return [ + ...lightens, + ...darkens, + ...alphaColors, + ...shortAlphaColors, + ...tinycolorDarkens, + ...tinycolorLightens, + ].filter((item) => !item.includes('-')); } diff --git a/package.json b/package.json index 44d925a2eac89f221b2229ed38f578a8261baee7..95bffdaf6d0123ffc115fdc214e6f049f0dd38cd 100644 --- a/package.json +++ b/package.json @@ -113,7 +113,7 @@ "vite-plugin-pwa": "^0.7.0", "vite-plugin-style-import": "^0.9.2", "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", "vue-eslint-parser": "^7.6.0" }, diff --git a/yarn.lock b/yarn.lock index 9d5f2637bb8938549fd78bfa3f7b6d49f1a29d51..54997449433c63d8c8f4418f59c0ead6a1eea0f5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9112,10 +9112,10 @@ vite-plugin-svg-icons@^0.4.1: svg-baker "1.7.0" svgo "^2.3.0" -vite-plugin-theme@^0.6.3: - version "0.6.3" - resolved "https://registry.npmjs.org/vite-plugin-theme/-/vite-plugin-theme-0.6.3.tgz#77be00b039eb53452c9adfce7fd90e39a39a81ee" - integrity sha512-ffhnqCtCG/0Y7egfiF9upJRo5ZEKS6lQOQsSztqu8gA2/SGsNTm3lsmEWvARMeUAj/8aF5PYzAv5EikfhcPENQ== +vite-plugin-theme@^0.6.4: + version "0.6.4" + resolved "https://registry.npmjs.org/vite-plugin-theme/-/vite-plugin-theme-0.6.4.tgz#51376c328d708aa30ce56031ff4d7dd02cca613f" + integrity sha512-GoXSDHjmDNU2R6bmuyr67VqI5dekGSejNMzlGTivMOmNl516464ATmV5NtoCDNiPJ1QYYnMRjZSQNfZ/Fxl7Qg== dependencies: "@types/node" "^14.14.37" "@types/tinycolor2" "^1.4.2"