Commit Graph

1060 Commits

Author SHA1 Message Date
afc163
91a749a810 move ant-checkbox into ant-form-item 2015-07-15 17:22:58 +08:00
Yuwei Ba
9d49d4b52d 更新 Pagination 文档 2015-07-15 16:50:13 +08:00
afc163
726197c45e improve pagination item transition effect 2015-07-15 16:34:08 +08:00
afc163
2d4ce509df fix badge 2015-07-15 16:23:03 +08:00
afc163
4cb7684093 fix badge 2015-07-15 16:21:18 +08:00
afc163
9b15ec3091 Add Dependency Status badge 2015-07-15 16:20:41 +08:00
afc163
28d0037cf5 update rc-select to 4.3 2015-07-15 16:18:50 +08:00
afc163
2ae1cf4cba Merge branch 'master' of github.com:ant-design/ant-design 2015-07-15 16:13:56 +08:00
afc163
207041879b improve input number demos 2015-07-15 16:13:00 +08:00
蔡伦
f757f2b883 Merge remote-tracking branch 'origin/master' 2015-07-15 16:03:57 +08:00
蔡伦
59b927838a Merge remote-tracking branch 'origin/master' 2015-07-15 16:01:44 +08:00
simaQ
04d944ee83 Merge branch 'master' of https://github.com/ant-design/ant-design 2015-07-15 16:01:35 +08:00
蔡伦
40595178ce demo update 2015-07-15 16:01:24 +08:00
simaQ
2ed33e8056 add slider into form 2015-07-15 16:00:59 +08:00
afc163
a5c2763571 Merge branch 'master' of github.com:ant-design/ant-design 2015-07-15 15:51:06 +08:00
afc163
6f74c11949 fix input number hover color 2015-07-15 15:50:44 +08:00
simaQ
68394ffc2a Merge branch 'master' of https://github.com/ant-design/ant-design 2015-07-15 15:49:31 +08:00
simaQ
0883cdf645 update slider tooltip conflict 2015-07-15 15:48:47 +08:00
偏右
b78f872480 Merge pull request #45 from ibigbug/master
更新 Pagination
2015-07-15 15:41:26 +08:00
Yuwei Ba
ccaa541ec4 更新 Pagination slash 样式 2015-07-15 15:36:06 +08:00
Yuwei Ba
35873cb90c 修复 Select 不显示的问题 2015-07-15 15:36:06 +08:00
蔡伦
581d62b233 Merge branch 'master' of github.com:ant-design/ant-design
# By afc163 (55) and others
# Via afc163 (21) and others
* 'master' of github.com:ant-design/ant-design: (96 commits)
  arrow size and rotate
  input focus style update
  update site style
  fix color variable
  sort params
  修复清空的问题
  prepare npm
  update table document
  fix sort table logic, only allow one column to be sorted at a time
  chore: change collapse color
  optimize deploy
  update table row-selection style
  update table demos
  fix markdown table in chrome
  fix table loading style
  feat: collapse style review and change
  fix table loading style
  fix table loading style
  update table document
  update filter dropdown function and style
  ...

Conflicts:
	index.js
	style/components/index.less
2015-07-15 15:28:33 +08:00
蔡伦
ff0262c50c Merge branch 'master' of github.com:ant-design/ant-design
# By afc163 (55) and others
# Via afc163 (21) and others
* 'master' of github.com:ant-design/ant-design: (96 commits)
  arrow size and rotate
  input focus style update
  update site style
  fix color variable
  sort params
  修复清空的问题
  prepare npm
  update table document
  fix sort table logic, only allow one column to be sorted at a time
  chore: change collapse color
  optimize deploy
  update table row-selection style
  update table demos
  fix markdown table in chrome
  fix table loading style
  feat: collapse style review and change
  fix table loading style
  fix table loading style
  update table document
  update filter dropdown function and style
  ...

Conflicts:
	index.js
	style/components/index.less
2015-07-15 15:28:07 +08:00
afc163
de00430607 Merge branch 'master' of github.com:ant-design/ant-design 2015-07-15 15:19:29 +08:00
蔡伦
26c42c6cec add checkbox 2015-07-15 15:19:24 +08:00
afc163
d1ef33e45d arrow size and rotate 2015-07-15 15:19:04 +08:00
偏右
c8eea9fddb Merge pull request #44 from ant-design/npm
prepare npm
2015-07-15 15:08:32 +08:00
afc163
0f2ace6e37 input focus style update 2015-07-15 15:02:18 +08:00
afc163
18efc89494 update site style 2015-07-15 14:35:40 +08:00
afc163
e28926292c fix color variable 2015-07-15 14:31:43 +08:00
afc163
b0f3a552b6 sort params 2015-07-15 14:10:01 +08:00
afc163
fe230f7084 修复清空的问题 2015-07-15 12:16:28 +08:00
yiminghe
b5e1ab5e47 prepare npm 2015-07-15 12:09:01 +08:00
afc163
aa830e0c44 update table document 2015-07-15 11:45:43 +08:00
afc163
4908cd2efa Merge branch 'master' of github.com:ant-design/ant-design 2015-07-15 11:43:23 +08:00
afc163
191235fcdc fix sort table logic, only allow one column to be sorted at a time 2015-07-15 11:43:00 +08:00
翰文
c39a1e3d02 chore: change collapse color 2015-07-15 11:34:18 +08:00
yiminghe
fced70bd69 Merge branch 'master' of github.com:ant-design/ant-design 2015-07-15 11:26:55 +08:00
yiminghe
0ef8cd410f optimize deploy 2015-07-15 11:26:33 +08:00
afc163
35c5ac8efa update table row-selection style 2015-07-15 11:12:17 +08:00
afc163
4cd12077cb update table demos 2015-07-15 10:47:47 +08:00
afc163
10a4d84b30 Merge branch 'master' of github.com:ant-design/ant-design 2015-07-15 10:34:14 +08:00
afc163
40517edaeb fix markdown table in chrome 2015-07-15 10:34:07 +08:00
Eward Song
b8efd16ed3 Merge pull request #43 from ant-design/collapse-review
collapse样式修改
2015-07-14 21:13:05 +08:00
afc163
9f2509d839 fix table loading style 2015-07-14 21:12:02 +08:00
翰文
6011f5caeb feat: collapse style review and change 2015-07-14 21:09:40 +08:00
afc163
076b8e1e33 fix table loading style 2015-07-14 21:08:25 +08:00
afc163
41525cc19b fix table loading style 2015-07-14 21:06:39 +08:00
偏右
d085ad32f1 Merge pull request #42 from ant-design/components-table
Components table
2015-07-14 21:02:07 +08:00
afc163
2a41f0802b Merge master to components-table 2015-07-14 21:01:42 +08:00