github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #32 from QingWei-Li/master 

Update package.json scripts, fixed #30
pull/36/head
FuryBean 2016-09-08 11:20:29 +08:00 committed by GitHub
parent 22e7a75508 a3cfc8a4f9
commit 9c0fbef1ed
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
package.json
View File

@ -9,9 +9,9 @@
], ],
"scripts": { "scripts": {
"dev": "npm i && (node bin/iconInit.js & node bin/build-entry.js) && cooking watch -c scripts/cooking.demo.js", "dev": "npm i && (node bin/iconInit.js & node bin/build-entry.js) && cooking watch -c scripts/cooking.demo.js",
"dist": "rm -rf lib && cooking build -c scripts/cooking.conf.js -p && cooking build -c scripts/cooking.component.js -p && npm run build:theme", "dist": "del -f lib && cooking build -c scripts/cooking.conf.js -p && cooking build -c scripts/cooking.component.js -p && npm run build:theme",
"dist:all": "node bin/build-all.js && npm run build:theme", "dist:all": "node bin/build-all.js && npm run build:theme",
"build:theme": "node_modules/.bin/gulp build --gulpfile packages/theme-default/gulpfile.js && cp -rf packages/theme-default/lib lib/theme-default", "build:theme": "gulp build --gulpfile packages/theme-default/gulpfile.js && cp-cli packages/theme-default/lib lib/theme-default",
"deploy": "cooking build -c scripts/cooking.demo.js -p", "deploy": "cooking build -c scripts/cooking.demo.js -p",
"gh-docs": "cooking build -c scripts/cooking.demo.js -p && gh-pages -d examples/element-ui --remote origin", "gh-docs": "cooking build -c scripts/cooking.demo.js -p && gh-pages -d examples/element-ui --remote origin",
"postinstall": "lerna bootstrap", "postinstall": "lerna bootstrap",
@ -32,7 +32,7 @@
}, },
"devDependencies": { "devDependencies": {
"babel-core": "^6.14.0", "babel-core": "^6.14.0",
"babel-helper-vue-jsx-merge-props": "^1.0.1", "babel-helper-vue-jsx-merge-props": "^2.0.0",
"babel-loader": "^6.2.5", "babel-loader": "^6.2.5",
"babel-plugin-syntax-jsx": "^6.8.0", "babel-plugin-syntax-jsx": "^6.8.0",
"babel-plugin-transform-vue-jsx": "^3.1.0", "babel-plugin-transform-vue-jsx": "^3.1.0",
@ -41,7 +41,9 @@
"cooking": "^1.0.0-rc.2", "cooking": "^1.0.0-rc.2",
"cooking-lint": "^0.1.2", "cooking-lint": "^0.1.2",
"cooking-vue2": "^0.1.4", "cooking-vue2": "^0.1.4",
"cp-cli": "^1.0.2",
"css-loader": "^0.24.0", "css-loader": "^0.24.0",
"del-cli": "^0.2.0",
"extract-text-webpack-plugin": "^1.0.1", "extract-text-webpack-plugin": "^1.0.1",
"file-loader": "^0.9.0", "file-loader": "^0.9.0",
"file-save": "^0.2.0", "file-save": "^0.2.0",
@ -52,6 +54,7 @@
"html-webpack-plugin": "^2.22.0", "html-webpack-plugin": "^2.22.0",
"json-loader": "^0.5.4", "json-loader": "^0.5.4",
"json-templater": "^1.0.4", "json-templater": "^1.0.4",
"kanpai": "^0.7.0",
"lerna": "2.0.0-beta.18", "lerna": "2.0.0-beta.18",
"markdown-it": "^6.1.1", "markdown-it": "^6.1.1",
"markdown-it-container": "^2.0.0", "markdown-it-container": "^2.0.0",
@ -72,4 +75,4 @@
"webpack-dev-server": "^1.15.1", "webpack-dev-server": "^1.15.1",
"wind-dom": "0.0.3" "wind-dom": "0.0.3"
} }
} }

3
packages/badge/src/main.vue
View File

@ -4,7 +4,8 @@
<sup <sup
v-text="content" v-text="content"
class="el-badge__content" class="el-badge__content"
:class="{ 'is-fixed': $slots.default, 'is-dot': isDot }" /> :class="{ 'is-fixed': $slots.default, 'is-dot': isDot }">
</sup>
</div> </div>
</template> </template>