Merge branch 'next' of github.com:eleme/element-ui into next
# Conflicts: # examples/app.vue # examples/nav.config.json # examples/pages/component.vue # examples/pages/design.vue # examples/pages/guide.vue # examples/pages/nav.vue # examples/pages/resource.vue # examples/route.config.js
Showing
33.3 KB
49.1 KB
32.2 KB
30.5 KB
5.06 KB
5.2 KB
7.75 KB
5.29 KB
12.5 KB
examples/docs/layout.md
0 → 100644
examples/pages/index.vue
0 → 100644
| ... | ... | @@ -27,7 +27,8 @@ |
| "url": "https://github.com/eleme/element-ui/issues" | ||
| }, | ||
| "dependencies": { | ||
| "object-assign": "^4.1.0" | ||
| "object-assign": "^4.1.0", | ||
| "typing.js": "^2.1.0" | ||
| }, | ||
| "devDependencies": { | ||
| "babel-helper-vue-jsx-merge-props": "^1.0.1", | ||
| ... | ... | @@ -44,6 +45,7 @@ |
| "oui-dom-events": "^0.2.1", | ||
| "postcss": "^5.0.21", | ||
| "purecss": "^0.6.0", | ||
| "strip-tags": "^0.1.1", | ||
| "uppercamelcase": "^1.1.0", | ||
| "vue": "^2.0.0-rc.2", | ||
| "vue-loader": "^9.3.2", | ||
| ... | ... |