Merge remote-tracking branch 'origin/master' into hotfix/waterfall

2017-02-27 10:35:19 +08:00
parent 787ff255b8 a8bbc42cda
commit 7d95d626a5
91 changed files with 939 additions and 268 deletions
@@ -8,8 +8,6 @@ var OUTPUT_PATH = path.join(__dirname, '../../src/index.js');
 var IMPORT_TEMPLATE = 'import {{name}} from \'../packages/{{package}}/index.js\';';
 var ISNTALL_COMPONENT_TEMPLATE = '  Vue.component({{name}}.name, {{name}});';
 var MAIN_TEMPLATE = `{{include}}
-// zanui
-import '../packages/zanui-css/src/index.pcss';

 const install = function(Vue) {
  if (install.installed) return;