Drjingfubo 3 年 前
コミット
9521b6829c

+ 1 - 1
jd/generate-nutui-taro-vue.cjs

@@ -17,7 +17,7 @@ config.nav.map((item) => {
     packages.push(name);
   });
 });
-let importCssVar = `import '../packages/styles/css-variables.scss';\n`;
+let importCssVar = `import '../packages/styles/theme-deafult.scss';\n`;
 let installFunction = `function install(app: any) {
   const packages = [${packages.join(',')}];
   packages.forEach((item:any) => {

+ 1 - 1
jd/generate-nutui.cjs

@@ -14,7 +14,7 @@ config.nav.map((item) => {
     packages.push(name);
   });
 });
-let importCssVar = `import '../packages/styles/css-variables.scss';\n`;
+let importCssVar = `import '../packages/styles/theme-deafult.scss';\n`;
 let installFunction = `function install(app: App) {
   const packages = [${packages.join(',')}];
   packages.forEach((item:any) => {

src/packages/styles/css-variables.scss → src/packages/styles/theme-deafult.scss


ファイルの差分が大きいため隠しています
+ 806 - 733
src/packages/styles/variables.scss


+ 1 - 4
src/sites/mobile-taro/vue/config/index.js

@@ -17,10 +17,7 @@ const config = {
     '@/packages': path.resolve(__dirname, '../../../../../src/packages')
   },
   sass: {
-    resource: [
-      path.resolve(__dirname, '../../../../', 'packages/styles/variables-var.scss')
-      // path.resolve(__dirname, '../../../../', 'packages/styles/css-variables.scss'),
-    ]
+    resource: [path.resolve(__dirname, '../../../../', 'packages/styles/variables.scss')]
   },
   defineConstants: {},
   copy: {

+ 1 - 1
vite.config.ts

@@ -36,7 +36,7 @@ export default defineConfig({
       scss: {
         // example : additionalData: `@import "./src/design/styles/variables";`
         // dont need include file extend .scss
-        additionalData: `@import "@/packages/styles/variables-var.scss";@import "@/sites/assets/styles/variables.scss";`
+        additionalData: `@import "@/packages/styles/variables.scss";@import "@/sites/assets/styles/variables.scss";`
       }
     },
     postcss: {