Merge branch 'master' of gitlab.qima-inc.com:fe/zanui-vue

.eslintrc.js

@@ -25,7 +25,7 @@ module.exports = {
     'no-new': 0
   },
   "globals": {
-    "oxygen": true,
+    "zanui": true,
     "location": true,
     "Swiper": true,
     "wysihtml5": true,

build/bin/build-entry.js

@@ -44,15 +44,13 @@ ComponentNames.forEach(name => {
   }));
 
   if ([
-      // directives
-    'InfiniteScroll',
+    // directives
     'Lazyload',
+    'Waterfall',
 
-      // services
+    // services
     'Dialog',
-    'Toast',
-    'Indicator',
-    'Waterfall'
+    'Toast'
   ].indexOf(componentName) === -1) {
     installTemplate.push(render(ISNTALL_COMPONENT_TEMPLATE, {
       name: componentName,

docs/examples/switch.vue

@@ -17,6 +17,7 @@
         <div class="page-switch__text">OFF, DISABLED</div>
       </div>
     </div>
+  </div>
 </template>
 
 <script>

docs/index.js

@@ -6,11 +6,11 @@ import routes from './router.config';
 import demoBlock from './components/demo-block';
 import SideNav from './components/side-nav';
 import Mobile from './components/mobile';
-import Oxygen from '../src/index';
+import ZanUI from '../src/index';
 
 import 'packages/zanui-css/src/index.css';
 
-Vue.use(Oxygen);
+Vue.use(ZanUI);
 Vue.use(VueRouter);
 Vue.component('demo-block', demoBlock);
 Vue.component('side-nav', SideNav);

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@youzan/oxygen",
+  "name": "@youzan/zanui-vue",
   "version": "0.0.1",
   "description": "有赞vue wap组件库",
   "main": "lib/zanui.js",
@@ -23,7 +23,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git@gitlab.qima-inc.com:fe/oxygen.git"
+    "url": "git@gitlab.qima-inc.com:fe/zanui-vue.git"
   },
   "keywords": [
     "youzan",

packages/zanui-css/src/steps.css

@@ -0,0 +1,5 @@
+@component-namespace z {
+  @b steps {
+    color: red;
+  }
+}