15 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
jiangruowei	9a4dc8fb64	Merge branch 'master' into hotfix/switch_loading_fix	2017-02-28 16:45:13 +08:00
jiangruowei	06e60122d0	fix: update loading	2017-02-28 16:24:51 +08:00
jiangruowei	0606925698	style: use BEM style	2017-02-28 11:36:46 +08:00
jiangruowei	09cf3d1c25	fix：switch方向改变&rename	2017-02-28 11:35:56 +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
jiangruowei	50f173e875	feat: 添加loading	2017-02-22 17:31:33 +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
jiangruowei	0d3a0f1a88	Merge branch 'master' of gitlab.qima-inc.com:fe/oxygen	2017-02-22 10:16:14 +08:00
jiangruowei	89ecad5989	Merge branch 'switch'	2017-02-15 17:47:52 +08:00
jiangruowei	06eedfef4a	Merge branch 'switch' of gitlab.qima-inc.com:fe/oxygen into switch	2017-02-13 18:05:22 +08:00
jiangruowei	2c3cc3c296	fix: ui tweaks	2017-02-13 18:05:14 +08:00
jiangruowei	72ea01032e	feat: add switch	2017-02-07 17:40:38 +08:00