143 Commits

Author	SHA1	Message	Date
jiangruowei	2baef3a62b	fix: fix style	2017-03-15 20:31:08 +08:00
cookfront	3743f82dfe	Merge branch 'master' of gitlab.qima-inc.com:fe/zanui-vue	2017-03-15 17:25:48 +08:00
cookfront	cf8b8dab2d	swipe components	2017-03-15 17:25:28 +08:00
jiangruowei	c515965358	merge: merge master	2017-03-15 16:31:00 +08:00
jiangruowei	98071b8634	feat: update toast doc	2017-03-15 16:26:12 +08:00
taiyong	b653859f61	merge: master	2017-03-15 10:50:19 +08:00
jiangruowei	2de6435873	feat: add toast	2017-03-15 10:10:31 +08:00
cookfront	bfa472e6e5	swipe	2017-03-14 22:53:04 +08:00
taiyong	7d5b336fac	uploader	2017-03-14 18:00:39 +08:00
cookfront	2915c36507	fix css	2017-03-14 16:28:22 +08:00
cookfront	fcec8efae6	fix popup	2017-03-14 15:42:22 +08:00
cookfront	902c520268	fix field	2017-03-14 15:31:18 +08:00
cookfront	93b2267a50	border field	2017-03-14 15:24:09 +08:00
jiangruowei	ea8ef564b9	merge: merge master&&rebuild docs	2017-03-13 21:19:39 +08:00
jiangruowei	5f7e98a547	feat: 添加progress	2017-03-13 21:12:02 +08:00
cookfront	ec77685afc	fix card	2017-03-13 14:30:21 +08:00
cookfront	f6b3eb8365	quantity component	2017-03-10 15:09:10 +08:00
cookfront	5387aaae29	fix filed and step	2017-03-09 17:32:44 +08:00
cookfront	c96fa4c35b	action sheet component	2017-03-09 16:01:40 +08:00
cookfront	8dff910c64	popup	2017-03-08 21:15:44 +08:00
cookfront	a4988f99bc	popup	2017-03-08 20:39:09 +08:00
zhangmin	9bb76ae8cd	Merge branch 'feature/tabs_lazyload' into 'master' ... Feature/tabs lazyload review一下 See merge request !9	2017-03-08 15:24:36 +08:00
cookfront	6551e81ec8	picker toolbar	2017-03-08 15:00:57 +08:00
zhuxiang	fdf2868cc7	done	2017-03-07 15:00:05 +08:00
cookfront	7890938a1d	build docs	2017-03-06 21:49:41 +08:00
cookfront	7093f1772f	文档优化	2017-03-06 15:16:02 +08:00
cookfront	019bb5c7d8	action sheet	2017-03-06 11:21:27 +08:00
cookfront	6f3f98c601	Merge branch 'master' of gitlab.qima-inc.com:fe/zanui-vue	2017-03-05 16:58:18 +08:00
cookfront	8856af91fd	image preview	2017-03-05 16:57:50 +08:00
niunai	5e976c8e20	Merge branch 'master' of gitlab.qima-inc.com:fe/zanui-vue ... Conflicts: packages/zanui-css/src/index.css	2017-03-03 17:58:36 +08:00
niunai	e918c52fd0	增加zan-layout	2017-03-03 17:58:08 +08:00
cookfront	1cf5490f99	image preview component	2017-03-03 15:46:26 +08:00
zhuxiang	522830aac5	tabs almost	2017-03-03 14:08:33 +08:00
jiangruowei	67e37c9050	Merge branch 'master' into hotfix/switch_loading_fix	2017-03-02 19:59:36 +08:00
jiangruowei	26babf0b13	feat: 更新loading	2017-03-02 19:58:26 +08:00
cookfront	98d1bc7157	step component	2017-03-02 19:37:10 +08:00
jiangruowei	7c6bfc6714	fix: minor fix	2017-03-02 17:29:50 +08:00
jiangruowei	bbf787218f	feat: ui tweaks	2017-03-02 17:21:20 +08:00
cookfront	50f2fd88e2	Merge branch 'master' of gitlab.qima-inc.com:fe/zanui-vue	2017-03-02 16:07:11 +08:00
cookfront	8eff262e48	step component	2017-03-02 16:07:02 +08:00
niunai	7d0dfa0555	Merge branch 'master' of gitlab.qima-inc.com:fe/zanui-vue	2017-03-02 15:53:34 +08:00
niunai	b30b98e61c	when to modifier	2017-03-02 15:53:29 +08:00
cookfront	c8f7888dd2	step component	2017-03-02 13:59:27 +08:00
cookfront	6f2b44bb4d	step component	2017-03-02 11:29:01 +08:00
jiangruowei	ec168a9b9c	Merge branch 'master' into hotfix/switch_loading_fix	2017-03-01 17:04:54 +08:00
cookfront	7a3785c31b	fix css	2017-03-01 15:21:31 +08:00
zhuxiang	abc876b254	adjust	2017-03-01 15:10:03 +08:00
zhuxiang	5b34ea74ec	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
jiangruowei	d7e78352b7	fix: 修复loading偏移问题	2017-03-01 11:48:15 +08:00
jiangruowei	a6c3e4becd	fix: loading style change	2017-03-01 11:43:39 +08:00