Commit Graph

6 Commits (6c9de7146c94354a3928d194c96299b6f2c0f512)

Author SHA1 Message Date
tangjinzhou 4ce99b91e1 update configProvider 2019-09-11 22:51:52 +08:00
tangjinzhou da0f17d1b6 Merge remote-tracking branch 'origin/master' into feat-1.4.0
# Conflicts:
#	components/affix/index.jsx
#	components/alert/index.jsx
#	components/back-top/index.jsx
#	components/carousel/index.jsx
#	components/cascader/index.jsx
#	components/comment/index.jsx
#	components/config-provider/index.jsx
#	components/divider/index.jsx
#	components/drawer/index.jsx
#	components/form/Form.jsx
#	components/input-number/index.jsx
#	components/menu/index.jsx
#	components/modal/confirm.js
#	components/modal/index.js
#	components/popconfirm/index.jsx
#	components/popover/index.jsx
#	components/rate/index.jsx
#	components/steps/index.jsx
#	components/switch/index.jsx
#	components/time-picker/index.jsx
#	components/tree-select/index.jsx
#	site/components.js
2019-08-28 22:36:44 +08:00
tanjinzhou c9f1c26693 chore: add base.vue inconsistent vue version 2019-08-28 10:50:19 +08:00
wangxueliang 1713581576 feat: switch && timeline && skeleton 2019-03-18 20:35:24 +08:00
tangjinzhou ffb2a593b1 style: lint add semi and prettier 2019-01-12 12:46:29 +08:00
wangxueliang 1859364a8a feat: add skeleton 2018-12-10 11:34:51 +08:00