739 Commits

Author SHA1 Message Date
pangxie1991
69ac1d90cb Merge branch 'master' of gitlab.qima-inc.com:weapp/zui 2017-01-11 15:50:36 +08:00
pangxie1991
f608ac68ae steps 升级 2017-01-11 15:50:28 +08:00
Nino
53b5a12411 添加更多字体大小 2017-01-11 11:35:34 +08:00
Nino
79e8d41ae1 Merge branch 'master' of gitlab.qima-inc.com:weapp/zui 2017-01-10 18:05:36 +08:00
Nino
32fb5adc09 add home 2017-01-10 18:05:27 +08:00
pangxie1991
9677c9f82b Merge branch 'hotfix/steps_merge' 2017-01-04 17:57:54 +08:00
pangxie1991
5bedadf671 steps example 2017-01-04 16:59:28 +08:00
pangxie1991
096239ed51 steps 2017-01-04 16:38:00 +08:00
pangxie1991
2323611d55 steps 2017-01-04 11:55:12 +08:00
pangxie1991
4a3650e8e7 zui steps 2017-01-04 11:53:12 +08:00
pangxie1991
b5ee51c7cf steps merge 2017-01-04 11:46:36 +08:00
Nino
49a202f2b1 Merge branch 'master' of gitlab.qima-inc.com:weapp/zui 2017-01-03 20:42:52 +08:00
Nino
69814b9d9a 更新icon 2017-01-03 20:42:41 +08:00
pangxie1991
bec73512bd example 优化 2017-01-03 20:15:16 +08:00
pangxie1991
5bae0894f3 修改 example 2017-01-03 20:03:17 +08:00
pangxie1991
c235c97611 Merge branch 'master' of gitlab.qima-inc.com:weapp/zui 2017-01-03 19:55:57 +08:00
pangxie1991
bcb29ffa3b add card 14px 2017-01-03 19:55:48 +08:00
Nino
7bf93b5dee Merge branch 'master' of gitlab.qima-inc.com:weapp/zui 2017-01-03 19:48:28 +08:00
pangxie1991
46834bfeca namecard -> card 2017-01-03 14:12:14 +08:00
pangxie1991
0e16e445e3 Merge branch 'master' of gitlab.qima-inc.com:weapp/zui 2017-01-03 11:09:50 +08:00
pangxie1991
ffdf720859 steps pic to background 2017-01-03 11:09:07 +08:00
Nino
300983843b Merge branch 'master' of gitlab.qima-inc.com:weapp/zui 2017-01-03 10:15:08 +08:00
pangxie1991
4bf7b19a52 Merge branch 'master' of gitlab.qima-inc.com:weapp/zui 2016-12-30 20:47:22 +08:00
pangxie1991
3cdc6622be vsteps 2016-12-30 20:47:17 +08:00
Nino
32dbf36ee3 fix loadmore 2016-12-30 16:27:25 +08:00
Nino
7e6db0caf4 icon 2016-12-30 16:26:27 +08:00
Nino
629b783ad7 Merge branch 'master' of gitlab.qima-inc.com:weapp/zui 2016-12-28 17:25:07 +08:00
Nino
1b28c2aa28 调整loadmore的位置 2016-12-28 17:24:48 +08:00
pangxie1991
4c22c9877d flex 1 2016-12-28 13:36:37 +08:00
pangxie1991
fcdfe960e0 Merge branch 'master' of gitlab.qima-inc.com:weapp/zui 2016-12-28 13:36:02 +08:00
pangxie1991
faebd64680 zui form 增加 textarea支持 2016-12-28 13:33:43 +08:00
Nino
ed112e6cc3 数量选择器添加小号样式 2016-12-27 15:01:46 +08:00
Nino
29eb1276ac rename zui-btn--big to zui-btn--large 2016-12-26 16:38:47 +08:00
Nino
807a745ef8 Merge branch 'master' of gitlab.qima-inc.com:weapp/zui 2016-12-26 16:36:23 +08:00
Nino
e440c562de 防止样式被 button[disabled] 的规则覆盖,所以使用了important 2016-12-26 16:36:06 +08:00
pangxie1991
ce431b8415 toptips add min height 2016-12-26 15:01:43 +08:00
pangxie1991
8ec6023f88 toast toptips 2016-12-23 15:01:46 +08:00
pangxie1991
1d06a3da7b name card 增加内容,方便些东西 2016-12-23 14:56:54 +08:00
pangxie1991
96be32205f Merge branch 'master' of gitlab.qima-inc.com:weapp/zui 2016-12-23 14:52:19 +08:00
pangxie1991
f2c91d53ed vsteps 2016-12-23 14:45:42 +08:00
Nino
f438240812 build 2016-12-22 20:09:21 +08:00
Nino
9c435055fc fix tab fixed bug 2016-12-22 17:07:31 +08:00
Nino
eb89c6fbc8 调整 2016-12-22 15:09:43 +08:00
Nino
9b761bd032 add dialog example 2016-12-22 15:00:10 +08:00
Nino
979ae94f36 优化Dialog消失效果 2016-12-22 13:28:45 +08:00
Nino
4e75ba090b update icon 2016-12-22 11:52:23 +08:00
Nino
ae04b6c6d9 delete console 2016-12-22 10:59:38 +08:00
Nino
156559d8a6 Merge branch 'master' of gitlab.qima-inc.com:weapp/zui 2016-12-22 10:48:58 +08:00
Nino
6cded1d97b add icon 2016-12-22 10:48:50 +08:00
pangxie1991
f5a4e2d9a0 input 样式 2016-12-22 10:37:05 +08:00