10078 Commits

Author SHA1 Message Date
cookfront
f1d65f6a78 fix cell css 2017-02-24 18:01:01 +08:00
cookfront
f524d6ccd2 zanui css build 2017-02-24 17:46:56 +08:00
zhangmin
3ba60907b7 Merge branch 'loading' into 'master'
Loading

添加loading组件

See merge request !2
2017-02-23 11:09:38 +08:00
jiangruowei
5edd4af16a fix: change to BEM 2017-02-23 11:05:40 +08:00
jiangruowei
8b6c2d4351 Merge branch 'master' into loading 2017-02-23 10:55:06 +08:00
cookfront
e8e892b3a5 Merge branch 'master' of gitlab.qima-inc.com:fe/oxygen 2017-02-23 10:30:03 +08:00
cookfront
4a8d2b1dc9 fix eslint 2017-02-23 10:29:53 +08:00
niunai
99d7b41473 Merge branch 'master' of gitlab.qima-inc.com:fe/oxygen 2017-02-22 19:26:22 +08:00
niunai
30a5feae21 fix button click & change to bem style 2017-02-22 19:26:14 +08:00
cookfront
c4b59b4a7b component css 2017-02-22 18:49:50 +08:00
jiangruowei
50f173e875 feat: 添加loading 2017-02-22 17:31:33 +08:00
pangxie1991
846f555861 add: waterfall init 2017-02-22 16:21:06 +08:00
zhangmin
4589081506 Merge branch 'add_switch_animation' into 'master'
Add switch animation



See merge request !1
2017-02-22 15:34:34 +08:00
jiangruowei
396e46ef0a feat: 增加动画及使用BEM规范 2017-02-22 15:30:45 +08:00
jiangruowei
1417f22c3b Merge branch 'master' into add_switch_animation 2017-02-22 10:57:26 +08:00
jiangruowei
8953c781d2 Merge branch 'master' of gitlab.qima-inc.com:fe/oxygen 2017-02-22 10:57:12 +08:00
cookfront
3426ea0ac4 radio component 2017-02-22 10:56:53 +08:00
jiangruowei
0d3a0f1a88 Merge branch 'master' of gitlab.qima-inc.com:fe/oxygen 2017-02-22 10:16:14 +08:00
cookfront
8782fe99cb radio component 2017-02-21 09:52:46 +08:00
cookfront
a0910a754e picker component 2017-02-20 17:05:43 +08:00
cookfront
10768acc9f field css 2017-02-20 14:10:01 +08:00
cookfront
b6bb3c0fa8 picker component 2017-02-20 11:51:22 +08:00
cookfront
5bae32c726 picker component 2017-02-20 11:49:37 +08:00
niunai
bdc74d2298 Merge branch 'master' of gitlab.qima-inc.com:fe/oxygen 2017-02-20 10:14:32 +08:00
niunai
9a4ac14066 引入vue-jsx, 按钮完善 2017-02-20 01:10:00 +08:00
cookfront
9b6d85a887 picker component 2017-02-17 17:49:49 +08:00
niunai
e415d039f0 fix: build path rename 2017-02-17 16:27:39 +08:00
niunai
a44cdf96f8 fix: rename css package 2017-02-17 16:26:31 +08:00
cookfront
8f227dfcd6 Merge branch 'master' of gitlab.qima-inc.com:fe/oxygen 2017-02-17 16:05:49 +08:00
cookfront
c786235977 use zanui name 2017-02-17 16:04:37 +08:00
niunai
33c391fe5c Merge branch 'switch' 2017-02-17 16:03:45 +08:00
niunai
95908c02a2 Merge branch 'master' of gitlab.qima-inc.com:fe/oxygen 2017-02-17 16:03:39 +08:00
cookfront
3bed02995d dialog component 2017-02-16 17:15:35 +08:00
cookfront
c45822b400 fix lint 2017-02-16 16:54:15 +08:00
cookfront
3a1fca4953 popup component 2017-02-16 16:38:47 +08:00
cookfront
18c9d2c933 dialog component 2017-02-16 15:49:32 +08:00
cookfront
5c845093da dialog component 2017-02-16 15:38:32 +08:00
cookfront
7b0ab582d7 dialog component 2017-02-16 15:30:50 +08:00
cookfront
4c3cdd433b dialog component 2017-02-16 15:12:28 +08:00
cookfront
82bb27896e popup component 2017-02-15 21:03:07 +08:00
jiangruowei
89ecad5989 Merge branch 'switch' 2017-02-15 17:47:52 +08:00
niunai
3b7da63ac4 Merge branch 'master' of gitlab.qima-inc.com:fe/oxygen 2017-02-15 17:47:38 +08:00
niunai
72a60dc3e1 add border 2017-02-15 17:47:36 +08:00
cookfront
8f474da314 radio components 2017-02-15 09:58:19 +08:00
cookfront
cf87bd3603 form field component 2017-02-14 17:34:51 +08:00
cookfront
00848c6ea4 field component 2017-02-14 17:17:10 +08:00
cookfront
fb7089fd35 field component 2017-02-14 17:05:43 +08:00
cookfront
975c39029b cell component add click event 2017-02-14 15:22:45 +08:00
cookfront
f55d3cb7c4 cell and cell-group component 2017-02-14 14:45:38 +08:00
cookfront
f2b08a573e less 2017-02-13 23:16:53 +08:00