Leopoldthecoder 8 жил өмнө
parent
commit
6dfec6655f
4 өөрчлөгдсөн 247 нэмэгдсэн , 206 устгасан
  1. 3 2
      lerna.json
  2. 2 2
      package.json
  3. 1 1
      packages/theme-default/src/reset.css
  4. 241 201
      yarn.lock

+ 3 - 2
lerna.json

@@ -1,10 +1,11 @@
 {
-  "lerna": "2.0.0-beta.18",
+  "lerna": "2.0.0-beta.32",
   "version": "independent",
   "publishConfig": {
     "ignore": [
       "node_modules",
       "log.*"
     ]
-  }
+  },
+  "packages": ["packages/carousel", "packages/table", "packages/upload", "packages/date-picker", "packages/loading", "packages/pagination"]
 }

+ 2 - 2
package.json

@@ -19,7 +19,7 @@
     "dev": "npm run bootstrap && npm run build:file && cooking watch -c build/cooking.demo.js -p",
     "dev:play": "npm run build:file && cross-env PLAY_ENV=true cooking watch -c build/cooking.demo.js -p",
     "dist": "npm run clean && npm run build:file && npm run lint && cooking build -c build/cooking.conf.js,build/cooking.common.js,build/cooking.component.js -p && npm run build:utils && npm run build:theme",
-    "dist:all": "node build/bin/build-all.js && npm run build:theme",
+    "dist:all": "node build/bin/build-all.js",
     "i18n": "node build/bin/i18n.js",
     "lint": "eslint src/**/* test/**/* packages/**/*.{js,vue} build/**/* --quiet",
     "pub": "npm run bootstrap && sh build/git-release.sh && sh build/release.sh",
@@ -94,7 +94,7 @@
     "karma-sourcemap-loader": "^0.3.7",
     "karma-spec-reporter": "0.0.26",
     "karma-webpack": "^1.8.0",
-    "lerna": "2.0.0-beta.18",
+    "lerna": "^2.0.0-beta.32",
     "lolex": "^1.5.1",
     "markdown-it": "^6.1.1",
     "markdown-it-anchor": "^2.5.0",

+ 1 - 1
packages/theme-default/src/reset.css

@@ -5,7 +5,7 @@ body {
   font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
   font-weight: 400;
   font-size: var(--font-size-base);
-  color: var(--color-grey);
+  color: var(--color-base-black);
 }
 
 a {

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 241 - 201
yarn.lock


Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно