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

docs/App.vue

@@ -21,6 +21,8 @@ export default {
 </script>
 
 <style lang="css">
+  @import './assets/docs.css';
+
   .page-container {
     width: 1140px;
     padding: 0 30px;

docs/index.js

@@ -1,4 +1,3 @@
-import './assets/docs.css';
 import Vue from 'vue';
 import VueRouter from 'vue-router';
 import App from './App';
@@ -7,6 +6,8 @@ import demoBlock from './components/demo-block';
 import SideNav from './components/side-nav';
 import Oxygen from '../src/index';
 
+import 'packages/zanui-css/src/index.css';
+
 Vue.use(Oxygen);
 Vue.use(VueRouter);
 Vue.component('demo-block', demoBlock);

docs/nav.config.json

@@ -25,6 +25,10 @@
             {
               "path": "/card",
               "title": "Card"
+            },
+            {
+              "path": "/loading",
+              "title": "Loading"
             }
           ]
         },