Commit Graph

497 Commits

Author SHA1 Message Date
afc163
f394747429 fix checkbox demo 2015-07-16 14:48:57 +08:00
afc163
f692e62560 fix checkbox in table 2015-07-16 14:41:28 +08:00
afc163
1638d49892 update checkbox demos 2015-07-16 14:34:42 +08:00
afc163
db51898720 fix form style 2015-07-16 14:18:03 +08:00
afc163
d651364968 whitespace 2015-07-16 13:49:36 +08:00
afc163
8a84bb264b Merge 2015-07-16 13:36:04 +08:00
yiminghe
8c93c35f54 update style 2015-07-16 13:00:56 +08:00
yiminghe
d1cfcc83db update checkbox demo 2015-07-16 12:29:07 +08:00
afc163
86b722671a update checkbox style 2015-07-16 12:27:04 +08:00
yiminghe
5ffcbfefb4 fix checkbox style 2015-07-16 12:20:14 +08:00
afc163
d0ddb0457c Merge branch 'master' of github.com:ant-design/ant-design 2015-07-16 12:00:49 +08:00
afc163
29be5b654e fix popover and popconfirm 效果 2015-07-16 12:00:19 +08:00
simaQ
60527e0d56 update 2015-07-16 11:49:46 +08:00
afc163
ae3e33975b update input number demo 2015-07-16 10:53:06 +08:00
simaQ
1dfb2958da update slider 2015-07-16 10:17:11 +08:00
yiminghe
cbf2681c9f Merge branch 'master' of github.com:ant-design/ant-design 2015-07-15 20:55:04 +08:00
yiminghe
7c37203f37 fix ant-btn 2015-07-15 20:54:37 +08:00
afc163
9f1fbb9ebe selectRows 2015-07-15 20:22:56 +08:00
yiminghe
3777933020 fix select style 2015-07-15 19:59:54 +08:00
afc163
08e0efe25e update motion markdown style 2015-07-15 18:07:29 +08:00
afc163
9e785663a8 fix onSelect argument 2015-07-15 17:55:30 +08:00
afc163
d48b80299b code style 2015-07-15 17:32:32 +08:00
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
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
蔡伦
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
Yuwei Ba
35873cb90c 修复 Select 不显示的问题 2015-07-15 15:36:06 +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
蔡伦
26c42c6cec add checkbox 2015-07-15 15:19:24 +08:00
afc163
b0f3a552b6 sort params 2015-07-15 14:10:01 +08:00
afc163
fe230f7084 修复清空的问题 2015-07-15 12:16:28 +08:00
afc163
aa830e0c44 update table document 2015-07-15 11:45:43 +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
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
40517edaeb fix markdown table in chrome 2015-07-15 10:34:07 +08:00
afc163
41525cc19b fix table loading style 2015-07-14 21:06:39 +08:00
afc163
2a41f0802b Merge master to components-table 2015-07-14 21:01:42 +08:00
afc163
0ac833753c update table document 2015-07-14 20:58:54 +08:00
afc163
0e7f42937f update filter dropdown function and style 2015-07-14 20:43:27 +08:00
yiminghe
285eb6cbe7 Merge branch 'master' of github.com:ant-design/ant-design 2015-07-14 20:18:06 +08:00
afc163
3f3bd52d80 small table with mini pagination 2015-07-14 20:08:45 +08:00
afc163
a6661386c4 update ajax table demo 2015-07-14 20:04:14 +08:00
afc163
4d2119c358 prepare getParams arguments, filters, pagination, sorters 2015-07-14 18:29:43 +08:00
simaQ
d220314bf6 Merge branch 'master' of https://github.com/ant-design/ant-design 2015-07-14 18:15:07 +08:00
simaQ
4d9bbf8179 update index.md 2015-07-14 18:14:58 +08:00
afc163
ad04649366 ajax paging table 2015-07-14 17:58:00 +08:00
羽航
fa6e97364a 根据视觉review建议,删掉一些文字让demo看起来更好看些 2015-07-14 17:57:32 +08:00
afc163
17aabfa070 update paging 2015-07-14 16:34:26 +08:00
afc163
518bf992ba Merge branch 'master' into components-table 2015-07-14 16:12:30 +08:00
afc163
c915a3989b merge master to components-table 2015-07-14 15:37:19 +08:00
afc163
7ea054b3ff update table API, local data mode finished 2015-07-14 15:35:17 +08:00
Yuwei Ba
f93f9ee931 更新一些样式 2015-07-14 12:10:44 +08:00
simaQ
a4795453b8 update slider demo 2015-07-14 12:06:44 +08:00
yiminghe
ff295e1147 fix lint rules 2015-07-13 21:40:04 +08:00
afc163
6b9c988f12 Merge branch 'master' into components-table 2015-07-13 20:06:27 +08:00
偏右
00435273b5 Merge pull request #39 from ibigbug/master
添加分页组件
2015-07-13 19:48:36 +08:00
afc163
29068a0797 update filter.md 2015-07-13 19:47:31 +08:00
afc163
e982ab46ae improve filter 2015-07-13 18:42:08 +08:00
Yuwei Ba
fdb4ebbee2 添加 API 2015-07-13 17:51:28 +08:00
afc163
9440eb78b8 update sorter button click behaviours 2015-07-13 17:40:17 +08:00
afc163
ecea3b7d3f Merge branch 'master' into components-table 2015-07-13 17:22:10 +08:00
afc163
77c1e4d941 update switch demos 2015-07-13 16:52:07 +08:00
afc163
d843379008 finish sort function 2015-07-13 16:22:02 +08:00
Yuwei Ba
de6c509a36 Typo 2015-07-13 16:17:04 +08:00
Yuwei Ba
7a26598059 添加简洁的分页 2015-07-13 16:04:07 +08:00
罗宪
7d0b668801 update motion add ease 2015-07-13 15:48:24 +08:00
Yuwei Ba
1091ab0bfb 迷你版本樣式 2015-07-13 14:58:26 +08:00
afc163
01483740b3 merge from master 2015-07-13 10:57:34 +08:00
afc163
b53e76afff sort demo 2015-07-13 10:29:53 +08:00
simaQ
ca403d39af add slider display page 2015-07-13 08:00:31 +08:00
Yuwei Ba
27c6e03322 添加分页组件 2015-07-13 01:05:25 +08:00
afc163
4a53d5732f checkbox column width 2015-07-12 21:23:45 +08:00
afc163
6da3a29c07 small size table 2015-07-12 18:14:17 +08:00
afc163
ed9b0c507c load datasource in table, update API 2015-07-12 17:24:03 +08:00
afc163
c6889fa259 load datasource in table 2015-07-12 17:10:06 +08:00
afc163
5757d6cc78 operation links 2015-07-12 13:15:05 +08:00
afc163
ed9b534252 merge 2015-07-12 12:46:48 +08:00
afc163
5eb7ed9ff2 move message style to less file 2015-07-11 18:19:48 +08:00
afc163
8ae46a9282 improve message component 2015-07-11 18:05:43 +08:00
玄寂
4095e3eccb feat: add message component 2015-07-11 16:42:20 +08:00
玄寂
69c2a4c277 chore: adjust coding style, delete useless less, modify md files. 2015-07-11 16:41:08 +08:00
翰文
41244d83de feat: add message component
Conflicts:
	index.js
	style/components/index.less
2015-07-11 16:40:59 +08:00
翰文
599ea35ee6 feat(collapse): add demo nest collapse 2015-07-11 10:34:05 +08:00
翰文
4c28bc1fe2 feat: add component collapse 2015-07-11 10:17:58 +08:00
afc163
c9237c8e62 update API 2015-07-10 17:50:48 +08:00
afc163
4d2ce026ce row selection 2015-07-10 17:47:53 +08:00
simaQ
1164ba22a7 update iconfont 2015-07-10 17:17:58 +08:00
afc163
40bc7e3268 merge branch master 2015-07-10 10:48:59 +08:00
afc163
a7e7663cbb update API 2015-07-10 10:34:54 +08:00
yiminghe
32a5abdd91 Merge branch 'master' of github.com:ant-design/ant-design 2015-07-09 21:06:00 +08:00
yiminghe
782095125b update switch 2015-07-09 21:05:33 +08:00
afc163
b49a746ea7 change icon 2015-07-09 20:35:23 +08:00
afc163
c89a0c1441 fill demos with title 2015-07-09 20:29:26 +08:00
afc163
567280b0dc Merge branch 'master' into components-table 2015-07-09 20:14:02 +08:00
yiminghe
28a1720ec9 Merge branch 'master' of github.com:ant-design/ant-design 2015-07-09 20:07:10 +08:00