Merge branch 'master' into dev/badge_search

# Conflicts: # components.json # packages/zanui-css/src/index.css # src/index.js
2017-03-01 14:54:32 +08:00
parent 6808b06372 d4950678e6
commit 5b34ea74ec
152 changed files with 76771 additions and 19323 deletions
@@ -4,6 +4,7 @@
@import './button.css';
@import './button_group.css';
@import './cell.css';
+@import './card.css';
@import './dialog.css';
@import './field.css';
@import './icon.css';
@@ -14,4 +15,7 @@
@import './switch.css';
@import './badge.css';
@import './search.css';
-
+@import './panel.css';
+@import './steps.css';
+@import './tag.css';
+@import './checkbox.css';