Merge branch 'master' of github.com:ldsn/jianghu_h5

ldsn · Dec 20, 2017 · de22936 · de22936
2 parents e227d74 + 31ee867
commit de22936
Show file tree

Hide file tree

Showing 25 changed files with 235 additions and 19 deletions.
diff --git a/.roadhogrc b/.roadhogrc
@@ -27,5 +27,8 @@
       ]
     }
   },
+  "cssModulesExclude": [
+    "./src/assets/icon/iconfont.css"
+  ],
   "theme": "./src/common/theme.js"
 }
diff --git a/public/icon/iconfont.css b/public/icon/iconfont.css
diff --git a/public/icon/iconfont.eot b/public/icon/iconfont.eot
diff --git a/public/icon/iconfont.js b/public/icon/iconfont.js