Commit Graph

18396 Commits

Author SHA1 Message Date
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
afc163
e0d74468b8 update iconfont url 2015-07-09 20:06:11 +08:00
yiminghe
5991755496 update input-number 2015-07-09 20:06:03 +08:00
afc163
30e719cb49 merge master 2015-07-09 20:01:49 +08:00
afc163
68b9e6125b update iconfont 2015-07-09 18:24:41 +08:00
yiminghe
bb5a6d9c29 fix breadcrumb warning 2015-07-09 18:23:34 +08:00
afc163
f47b29817a import component rc-table 2015-07-09 14:51:48 +08:00
simaQ
a72bc1b93b update form demo page 2015-07-09 13:48:49 +08:00
afc163
82c110ac5d Add table demos 2015-07-09 11:41:36 +08:00
simaQ
db945443a6 update form display page 2015-07-09 10:55:37 +08:00
yiminghe
46b0685364 upgrade select 2015-07-08 22:07:15 +08:00
yiminghe
0a7410973e clean warning 2015-07-08 20:53:11 +08:00
simaQ
3b706a74e9 update demo 2015-07-08 20:15:19 +08:00
simaQ
3710ac73e3 remove .pd-rg .pd-lf 2015-07-08 20:15:02 +08:00
yiminghe
c85e10083d add switch 2015-07-08 19:47:45 +08:00
afc163
96606aab9e update site layout 2015-07-08 17:41:32 +08:00
afc163
3fedf7d6f2 Merge branch 'master' of github.com:ant-design/ant-design 2015-07-08 17:05:49 +08:00
afc163
b80a4be4b4 update motion chinese title 2015-07-08 17:05:43 +08:00
羽航
1de0aac428 Merge branch 'master' of github.com:ant-design/ant-design 2015-07-08 16:36:33 +08:00
羽航
74b4cad22f 进一步调整样式 2015-07-08 16:36:08 +08:00
afc163
99f7579809 update tooltip delay 2015-07-08 16:29:57 +08:00
羽航
943fbd3d34 调整steps的样式 2015-07-08 15:53:51 +08:00
afc163
a1200aa1d6 update layout.html 2015-07-08 15:41:19 +08:00
afc163
ea05974dc6 datepicker style update 2015-07-08 14:55:05 +08:00
simaQ
fd757fe0c4 tiny display modify 2015-07-08 12:02:13 +08:00
simaQ
37d1ba179b delete basic.md in form demo 2015-07-07 23:46:19 +08:00
simaQ
3c7f943d3e update form page 2015-07-07 23:45:46 +08:00
羽航
46c879dbbf Merge branch 'master' of https://github.com/ant-design/ant-design 2015-07-07 19:42:11 +08:00
羽航
fae077ce65 change steps style. add maxDescriptionWidth property 2015-07-07 19:36:42 +08:00
yiminghe
ad7f079251 move css-animation to demo 2015-07-07 15:39:21 +08:00
偏右
cde72c55c7 Merge pull request #29 from ant-design/style
Form 表单以及展示页面
2015-07-07 11:38:36 +08:00
simaQ
7fb5995309 add form and input style 2015-07-07 11:32:08 +08:00
simaQ
2d9919d4c6 add form display page 2015-07-07 11:25:16 +08:00
afc163
fff4f39e5f remove react-router from antd 2015-07-06 20:18:19 +08:00
afc163
db30835c0e require antd 2015-07-06 20:04:26 +08:00
afc163
d39b222b47 code style 2015-07-06 10:58:34 +08:00
simaQ
ef9ad70aea update form page 2015-07-06 09:04:39 +08:00
simaQ
c4cd3ce495 add form page 2015-07-06 09:04:39 +08:00
afc163
46ce040efd update layout demo style 2015-07-05 18:59:02 +08:00
afc163
a83b90decc button 2015-07-05 17:42:56 +08:00
afc163
0110b82ad9 update 2015-07-05 17:40:52 +08:00
afc163
8d6eeb5cae update directory structure 2015-07-05 15:43:07 +08:00
罗宪
a180871f61 update animation doc 2015-07-03 17:08:23 +08:00
罗宪
0b89f3631a update animation doc 2015-07-03 17:00:59 +08:00
afc163
925f811b45 remove react-router dependency from breadcrumb 2015-07-02 21:58:04 +08:00
yiminghe
46aee94b06 update datepicker 2015-07-02 20:40:27 +08:00
yiminghe
37d9c7b46c fix datepicker 2015-07-02 20:04:35 +08:00
afc163
c42ca53d91 breadcrumb 2015-07-02 18:33:37 +08:00
afc163
e551caddd5 support params in breadcrumb displayName 2015-07-02 18:05:34 +08:00
afc163
0963f9f608 change folder name 2015-07-02 17:24:50 +08:00
afc163
86e5a523ac breadcrumb & router 2015-07-02 17:22:26 +08:00
罗宪
d6960bdcd7 Merge branch 'master' of https://github.com/ant-design/ant-design 2015-07-02 13:57:35 +08:00
罗宪
ec7a6003e8 update for motion 2015-07-02 13:57:26 +08:00
afc163
23c1222a58 global require for demo code 2015-07-01 21:43:56 +08:00
afc163
ced4dcb991 update breadcrumb demo 2015-07-01 21:24:04 +08:00
afc163
c876a71a54 default motion for datepicker 2015-07-01 20:50:12 +08:00
afc163
228a1042b6 merge 2015-07-01 20:47:40 +08:00
afc163
c103918518 Add simple breadcrumb 2015-07-01 20:44:19 +08:00
yiminghe
8e14ea69da update docs 2015-07-01 18:52:50 +08:00
yiminghe
6e44d42114 allow empty 2015-07-01 18:45:59 +08:00
yiminghe
ba05e1e53c add swing 2015-07-01 17:25:16 +08:00
yiminghe
b98a302b9f add animation for picker 2015-07-01 15:54:39 +08:00
yiminghe
e7fec9dc1a add input-number 2015-07-01 14:50:21 +08:00
yiminghe
465c8c2cdf add input-number 2015-07-01 14:48:47 +08:00
afc163
65f72a5efe tweak code style 2015-07-01 10:26:48 +08:00
afc163
ba1e3492ef datepicker default value should be empty 2015-07-01 10:20:11 +08:00
yiminghe
9b23e39491 fix datepicker 2015-06-30 19:28:56 +08:00
羽航
4cbc692382 fix conflict 2015-06-26 16:18:54 +08:00
羽航
0f58bd541b change default prefixCls to ant-steps 2015-06-26 16:13:40 +08:00
afc163
4002ab3d68 更新组件文案 2015-06-26 14:42:30 +08:00
afc163
a78efca3fb Merge branch 'master' of github.com:ant-design/ant-design 2015-06-26 10:48:45 +08:00
afc163
b94a5f7a61 update steps demos 2015-06-26 10:46:21 +08:00
羽航
1bad0062f9 support ant-design prefix class and prefixCls property 2015-06-26 10:43:01 +08:00
afc163
9d62e0dc62 Merge branch 'master' of github.com:ant-design/ant-design 2015-06-26 10:22:21 +08:00
afc163
42c5942b9f change trigger element 2015-06-26 10:22:08 +08:00
羽航
6e23ea7d85 update readme 2015-06-26 10:03:13 +08:00
afc163
1fea96ac42 update demos 2015-06-25 20:01:20 +08:00
afc163
9c598b8bf7 Merge branch 'master' of github.com:ant-design/ant-design 2015-06-25 19:56:18 +08:00
afc163
dd0e7a94b6 挖坑 2015-06-25 19:55:15 +08:00
羽航
49c5585590 update package.json 2015-06-25 19:32:06 +08:00
羽航
39e2d9a3d2 add demos 2015-06-25 18:12:42 +08:00
羽航
a35e62db84 Merge branch 'master' of github.com:ant-design/ant-design into step 2015-06-25 18:08:50 +08:00
afc163
219675cba7 icon button 文案 2015-06-25 17:39:24 +08:00
羽航
1b4815608c fix conflict 2015-06-25 16:02:48 +08:00
羽航
e8ec073adc add steps 2015-06-25 16:01:04 +08:00
yiminghe
82913b8610 support promise for modal 2015-06-25 15:35:46 +08:00
yiminghe
dac8bc14c6 Merge branch 'master' of github.com:ant-design/ant-design 2015-06-25 15:30:48 +08:00
羽航
071a145e4e move rc-steps out 2015-06-25 15:30:17 +08:00
yiminghe
abcdaddcaa support promise for modal 2015-06-25 15:29:56 +08:00
afc163
76fbc4360b 坑位变动 2015-06-25 15:25:59 +08:00
羽航
06c12f9276 完善逻辑和样式,包括兼容ie8 2015-06-24 20:35:43 +08:00
afc163
6bd257de34 Add popconfirm component 2015-06-24 19:20:47 +08:00
羽航
13ece3c1bc rc-steps component 2015-06-24 14:52:49 +08:00
afc163
52c42d6ca0 Add motion 2015-06-23 10:43:17 +08:00
然则
2a7a4fb7f3 Merge branch 'master' of github.com:ant-design/ant-design 2015-06-19 18:01:10 +08:00
然则
65ac43f175 up demo 2015-06-19 18:00:39 +08:00
afc163
40c6e0689f Merge branch 'master' of github.com:ant-design/ant-design 2015-06-19 17:53:55 +08:00
afc163
66c645d4ab update select combobox demo 2015-06-19 17:52:50 +08:00
然则
4ef1630c69 Merge branch 'master' of github.com:ant-design/ant-design 2015-06-19 17:36:15 +08:00
然则
64465d7230 up select style 2015-06-19 17:35:32 +08:00
afc163
b0bbbdd245 add tab mini size demo 2015-06-19 17:26:34 +08:00
afc163
d68846adc5 update datepicker document 2015-06-19 17:05:36 +08:00
afc163
e8fd51f593 fix tabs style 2015-06-19 16:21:59 +08:00
afc163
b6561a9942 fix tabs style 2015-06-19 15:45:40 +08:00
afc163
4b569a16c2 use es6 feature 2015-06-19 12:29:22 +08:00
afc163
937e19245f 精简文案 2015-06-19 10:42:49 +08:00
afc163
dcdeb793c6 remove dropzone for now 2015-06-19 10:38:15 +08:00
afc163
74c30f4128 update modal style 2015-06-18 15:46:59 +08:00
pizn
d36e011bbb docs: 修改文案 2015-06-18 15:26:29 +08:00
afc163
bd7bbd0cd5 update demos 2015-06-18 12:02:38 +08:00
afc163
85a9cfda5a Merge branch 'master' of github.com:ant-design/ant-design 2015-06-18 11:58:38 +08:00
afc163
8ab58d6fce update rc-select and demos 2015-06-18 11:57:31 +08:00
夏奈
0b460e564d 交互文案 2015-06-18 11:25:38 +08:00
夏奈
e52164f35f 文字样式 2015-06-18 10:43:35 +08:00
simaQ
25fdb462ed rename some icons 2015-06-17 22:13:45 +08:00
afc163
3a3233111e update button demos 2015-06-17 21:29:58 +08:00
afc163
5a14501bcd update datepicker style 2015-06-17 21:20:43 +08:00
afc163
757a1b3f8b update tabs demos 2015-06-17 20:28:02 +08:00
afc163
db457cbe78 有逼格占坑 2015-06-17 20:24:42 +08:00
afc163
8100539f8d prefix className for popover 2015-06-17 20:15:09 +08:00
afc163
4f0eb44fb3 allow not to set key on menuitem, react-component/menu#9 2015-06-17 20:05:27 +08:00
afc163
a68c4a886d Add comment 2015-06-17 19:57:05 +08:00
afc163
dcdd808aea update iconfont 2015-06-17 19:48:17 +08:00
afc163
0beb66fa18 update iconfont 2015-06-17 19:46:23 +08:00
afc163
cce156fc83 Merge branch 'master' of github.com:ant-design/ant-design 2015-06-17 19:33:30 +08:00
afc163
9f7531fcc1 update popover documentation 2015-06-17 19:15:37 +08:00
simaQ
a66d7724ef Merge branch 'master' of https://github.com/ant-design/ant-design 2015-06-17 18:25:29 +08:00
simaQ
5294fd6b82 update button page 2015-06-17 18:22:20 +08:00
simaQ
525de2489b update iconfont page 2015-06-17 18:20:39 +08:00
afc163
418ff724d9 update button text 2015-06-17 17:46:01 +08:00
afc163
bbb146d051 修改文案 2015-06-17 17:25:12 +08:00
afc163
3c32f0c6c0 update progress demo 2015-06-17 17:19:34 +08:00
afc163
28f5caa191 update demo 2015-06-17 17:18:15 +08:00
afc163
b4a491cd8f Add animation for Tooltip 2015-06-17 17:15:34 +08:00
afc163
d3c9665c56 update popover and tooltip readme 2015-06-17 17:10:10 +08:00
afc163
7eaf96413e Add popover component 2015-06-17 16:58:13 +08:00
afc163
edb4d3a9fa adjust button demo order 2015-06-17 14:48:41 +08:00
afc163
d80fc6d7d6 update trigger button in dropdown demo 2015-06-17 14:44:24 +08:00
afc163
b74f6edacd adjust button demo 2015-06-17 14:42:49 +08:00
afc163
4bb09c2181 update progress demo 2015-06-16 21:24:09 +08:00
afc163
9021cd8145 update select api 2015-06-16 20:07:43 +08:00
afc163
5ac56461a1 update select combobox demo 2015-06-16 19:59:07 +08:00
afc163
a171eea1fd remove console.log 2015-06-16 16:32:15 +08:00
afc163
48700296b8 update select demos 2015-06-16 14:54:31 +08:00
simaQ
6ade8a5a82 tiny correction for buttons 2015-06-15 22:14:15 +08:00
afc163
51ac1b3617 二期组件挖坑 2015-06-15 22:01:39 +08:00
afc163
f4b226075f Merge branch 'master' of github.com:ant-design/ant-design 2015-06-15 21:30:37 +08:00
afc163
4adae8b3ed fix modal style 2015-06-15 21:30:17 +08:00
yiminghe
e07159834e update motion 2015-06-15 21:22:40 +08:00
yiminghe
73d89f46af update motion 2015-06-15 21:18:08 +08:00
afc163
edeb2a141b fix iconfont page style 2015-06-15 20:29:51 +08:00
afc163
d868a30661 prefixClassName ant-tab -> ant-tabs 2015-06-15 20:04:32 +08:00
yiminghe
1316b07cfd rename tab to tabs 2015-06-15 19:56:58 +08:00
simaQ
c21e2b3e77 Merge branch 'master' of https://github.com/ant-design/ant-design 2015-06-15 19:34:08 +08:00
simaQ
c6a2901bc3 update the style of button page 2015-06-15 19:33:39 +08:00
afc163
d65fe7723e Merge branch 'master' of github.com:ant-design/ant-design 2015-06-15 17:54:40 +08:00
afc163
16afacea79 adjust select demo 2015-06-15 17:54:34 +08:00
pizn
72d4f3c369 docs: 更新文档 2015-06-15 17:46:42 +08:00
afc163
f40fe75abb dropdown button arrow 2015-06-15 17:36:10 +08:00
afc163
42d69ccc07 Merge branch 'master' of github.com:ant-design/ant-design 2015-06-15 17:30:36 +08:00
afc163
4cfcf29a5f update progress size 2015-06-15 17:30:24 +08:00
然则
02a8ae56e7 Merge branch 'master' of github.com:ant-design/ant-design 2015-06-15 17:17:38 +08:00
然则
d73b1e5cec up 2015-06-15 17:17:23 +08:00
afc163
0c56f44d21 update progress demo 2015-06-15 16:49:37 +08:00
afc163
7e35666f98 Merge branch 'master' of github.com:ant-design/ant-design 2015-06-15 16:42:34 +08:00
afc163
5ffd623b18 update datepicker 2015-06-15 16:42:27 +08:00
夏奈
e59a6b2430 dynamic demo 2015-06-15 16:31:51 +08:00
夏奈
15027544ef Merge remote-tracking branch 'origin/master' 2015-06-15 16:27:01 +08:00
夏奈
e0dfb9d51e confilct 2015-06-15 16:26:44 +08:00
夏奈
2bb0992334 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	components/progress/demo/circle.md
#	components/progress/demo/line.md
2015-06-15 16:20:30 +08:00
afc163
120687c314 tabs -> tab 2015-06-15 16:20:06 +08:00
夏奈
331443419c 样式调整 2015-06-15 16:16:51 +08:00
偏右
9f99362aba Merge pull request #22 from ibigbug/tab-with-icon
添加带有 icon 的 Tab
2015-06-15 16:15:03 +08:00
Yuwei Ba
4c1014d905 添加带有 icon 的样式 2015-06-15 16:11:28 +08:00
afc163
f5835eec78 update element tagName 2015-06-15 15:11:02 +08:00
afc163
39bf1d09e7 update progress demo 2015-06-15 14:43:27 +08:00
afc163
61b7297ce4 update progress demo 2015-06-15 14:07:20 +08:00
夏奈
9b5c224234 m 2015-06-15 11:58:46 +08:00
夏奈
a100bc0de3 m 2015-06-15 11:55:54 +08:00
夏奈
2c58d5e1ce mini demo 2015-06-15 11:48:30 +08:00
afc163
e86755efbd update progress demo 2015-06-15 11:00:27 +08:00
夏奈
489ef17919 progress circle demo 2015-06-14 23:04:43 +08:00
夏奈
4ed91c35e1 progress circle demo 2015-06-14 20:07:21 +08:00
夏奈
0e28e52af4 Merge remote-tracking branch 'origin/master' 2015-06-14 19:50:56 +08:00
夏奈
61d947dbfa progress line demo 2015-06-14 19:50:23 +08:00
afc163
737ef1167d Add info for components 2015-06-14 17:54:08 +08:00
afc163
5e61c60661 update selet demo 2015-06-14 17:26:31 +08:00
afc163
10ff912e86 remove sketch link 2015-06-14 17:17:09 +08:00
夏奈
c467790b15 progress demo 2015-06-14 14:01:10 +08:00
夏奈
d2702bf92e Merge branch 'master' of github.com:ant-design/ant-design 2015-06-14 13:28:36 +08:00
afc163
81ee5588bc tweak code style 2015-06-14 13:21:29 +08:00
afc163
22c48941e9 tweak code style 2015-06-14 13:20:35 +08:00
偏右
34e1c66418 Merge pull request #20 from ibigbug/tab-style
Tab style
2015-06-14 13:13:39 +08:00
夏奈
3e2026efca progress demo 2015-06-14 12:55:44 +08:00
yiminghe
580481221f adjust onCancel 2015-06-12 23:46:04 +08:00
yiminghe
d5f760f9e7 remove ref 2015-06-12 23:31:44 +08:00
Yuwei Ba
3a4817b236 添加更多 Demo 2015-06-12 20:21:13 +08:00
Yuwei Ba
b870935c91 Tabs -> Tab 2015-06-12 20:03:38 +08:00
afc163
646c6853d6 move confirm into modal 2015-06-12 19:41:30 +08:00
afc163
b9b6cd33d0 components order 2015-06-12 17:49:30 +08:00
afc163
b5ae8925f2 update modal demos 2015-06-12 17:44:29 +08:00
afc163
0cbf1b9cc3 update modal demos 2015-06-12 17:37:39 +08:00
afc163
2dc587269f update modal demos 2015-06-12 17:11:32 +08:00
afc163
5062f3eccc Merge branch 'master' of github.com:ant-design/ant-design 2015-06-12 15:38:47 +08:00
simaQ
b493f6f06c add angle icon 2015-06-12 15:31:41 +08:00
afc163
bed9310cb4 Merge branch 'master' of github.com:ant-design/ant-design 2015-06-12 12:14:15 +08:00
yiminghe
90241a7efe fix prefixCls 2015-06-12 12:01:02 +08:00
afc163
294e12693d Merge branch 'master' of github.com:ant-design/ant-design 2015-06-12 10:44:31 +08:00
然则
58938d38e7 up select component 2015-06-11 19:23:35 +08:00
afc163
7f3180d0ef Merge branch 'master' of github.com:ant-design/ant-design 2015-06-11 19:14:48 +08:00
afc163
a73aff66f8 update datepicker style 2015-06-11 18:08:00 +08:00
simaQ
b3d5e31d26 optimize button 2015-06-11 17:20:24 +08:00
yiminghe
ae78df0337 pass lint 2015-06-11 16:38:46 +08:00
yiminghe
3690b2888d pass lint 2015-06-11 16:35:36 +08:00
afc163
81d61868b2 update confirm demo 2015-06-11 12:01:36 +08:00
simaQ
2e592509e1 rename icons 2015-06-11 10:57:32 +08:00
simaQ
b95b3b3386 rename some icons 2015-06-11 09:17:02 +08:00
yiminghe
64e2682ec6 fix tooltip 2015-06-10 22:11:58 +08:00
yiminghe
520b1b0d4e fix tooltip 2015-06-10 22:10:51 +08:00
yiminghe
56ce321e39 Merge branch 'master' of github.com:ant-design/ant-design 2015-06-10 22:03:37 +08:00
yiminghe
c634b4d14c add confirm 2015-06-10 22:02:13 +08:00
afc163
de14583dfd iconfont style fix 2015-06-10 20:40:10 +08:00
yiminghe
1d7c3af0f9 update tab 2015-06-10 19:50:02 +08:00
afc163
ce6ee800d5 datepicker prefix className 2015-06-10 19:46:41 +08:00
afc163
2136f910d1 improve iconfont page style 2015-06-10 18:13:49 +08:00
afc163
55041219f2 Add eslint, close #14 2015-06-10 17:59:32 +08:00
afc163
f5b57edbf4 typo 2015-06-10 17:23:15 +08:00
afc163
e7c90a5124 update dropdown demos 2015-06-10 17:12:03 +08:00
afc163
e2647767de Merge branch 'master' of github.com:ant-design/ant-design 2015-06-10 16:45:02 +08:00
afc163
ab6599b367 update modal demo 2015-06-10 16:43:35 +08:00
展新
b430179785 update: 更新文档 2015-06-10 16:28:10 +08:00
afc163
03ca066b5d update dropdown demo 2015-06-10 16:04:48 +08:00
afc163
4b5ee40139 文案位置调整 2015-06-10 13:49:15 +08:00
afc163
dac9345ec9 Merge branch 'master' of github.com:ant-design/ant-design 2015-06-10 13:48:22 +08:00
afc163
b6c1ace624 update tooltip style 2015-06-10 13:47:56 +08:00
展新
2a3185bbd7 Merge branch 'master' of github.com:ant-design/ant-design 2015-06-10 12:22:23 +08:00
展新
45f8ad1099 change: 删除没用的代码 2015-06-10 12:22:10 +08:00
afc163
8c7bd7aeb7 Add some text 2015-06-10 12:19:16 +08:00
展新
c3a8b5c39f changed: 修改flex的class书写方式 2015-06-10 10:39:26 +08:00
afc163
bf7d15a8bd Merge branch 'master' of github.com:ant-design/ant-design 2015-06-09 22:26:16 +08:00
afc163
9987b78abe update tab API 2015-06-09 22:25:32 +08:00
yiminghe
695c3b8ff6 upgrade rc-dialog 2015-06-09 22:24:19 +08:00
展新
428c41efae Merge branch 'master' of github.com:ant-design/ant-design 2015-06-09 22:20:15 +08:00
展新
428dae25ef feat: 增加 flex 布局的支持 2015-06-09 22:19:35 +08:00
偏右
4a56a4758c Merge pull request #13 from ibigbug/tabs-basic
Tabs basic
2015-06-09 22:07:01 +08:00
然则
63025753ec Merge branch 'master' of github.com:ant-design/ant-design 2015-06-09 21:32:13 +08:00
展新
a5cb458b46 feat: 增加layout的Demo及文档 2015-06-09 21:20:15 +08:00
然则
34e0fa4b8d add select component 2015-06-09 21:16:59 +08:00
展新
89b89c9fc5 Merge branch 'master' of github.com:ant-design/ant-design 2015-06-09 18:30:09 +08:00
展新
a4fd19b0a2 feat: update layout 2015-06-09 18:29:43 +08:00
afc163
351385622c update demo style 2015-06-09 18:28:53 +08:00
展新
c134ed7fea fixed: merge 2015-06-09 18:24:45 +08:00
Yuwei Ba
8fcecbe974 Tabs 文档 2015-06-09 18:23:59 +08:00
Yuwei Ba
6f76c07b51 Basic usage 2015-06-09 18:23:59 +08:00
Yuwei Ba
8ceeab7cde Copy style. 2015-06-09 18:23:59 +08:00
Yuwei Ba
d15dd65af8 Basic demo 2015-06-09 18:23:59 +08:00
展新
8127182595 new: 增加 layout 样式 2015-06-09 18:22:52 +08:00
afc163
e057eb1f6d fix copied code 2015-06-09 18:11:28 +08:00
afc163
7e142a7aa5 update Dropdown demo code style 2015-06-09 18:08:56 +08:00
yiminghe
38a6eaecf6 fix tooltip 2015-06-09 17:44:22 +08:00
夏奈
9062597658 Merge remote-tracking branch 'origin/master' 2015-06-09 16:54:31 +08:00
afc163
5117ef9ee1 copy code in react way 2015-06-09 16:55:31 +08:00
夏奈
67265d49e3 progress 2015-06-09 16:54:11 +08:00
afc163
9098cecbca copy code in react way 2015-06-09 16:50:26 +08:00
afc163
e156d76940 update tooltip style 2015-06-09 16:40:16 +08:00
simaQ
656d0ca2e8 adjust button page style 2015-06-09 15:21:07 +08:00
afc163
d924d5f2d0 update components spell 2015-06-09 14:50:55 +08:00
afc163
e278f63d2b update dropdown 2015-06-09 14:46:51 +08:00
afc163
cc702a3ef9 update dropdown demos 2015-06-09 13:46:47 +08:00
afc163
18bb5de5ec Add blockquote style 2015-06-09 12:16:39 +08:00
afc163
8093c24ba9 Merge branch 'master' of github.com:ant-design/ant-design 2015-06-09 12:12:05 +08:00
afc163
b256e03119 iconfont copy function 2015-06-09 12:11:43 +08:00
simaQ
2897bedc18 update button page 2015-06-09 12:05:59 +08:00
afc163
4af16c957c copy iconfont text 2015-06-08 23:41:11 +08:00
afc163
ef17365889 update ant-design page style 2015-06-08 22:42:36 +08:00
yiminghe
3267c220aa add hover demo 2015-06-08 19:21:17 +08:00
yiminghe
ac2899efbb add dropdown 2015-06-08 19:10:47 +08:00
afc163
80fcde6247 fix tabs 2015-06-08 16:43:53 +08:00
simaQ
5e71bbf6c2 format the sample codes of button page 2015-06-08 16:15:03 +08:00
simaQ
d281b8e59c add loading icon 2015-06-08 16:13:50 +08:00
afc163
d1d980007e update code type 2015-06-08 13:01:43 +08:00
afc163
8b18647908 rm anticon- prefix 2015-06-08 12:41:37 +08:00
afc163
9dfea5282e fix iconfont 2015-06-08 12:39:35 +08:00
afc163
c29f0214b5 button-group style fix 2015-06-08 12:32:09 +08:00
afc163
5a0c7977f0 update iconfont page style 2015-06-07 17:18:14 +08:00
simaQ
61b4dddae9 update buttons 2015-06-07 14:03:00 +08:00
simaQ
4d48350b2e update iconfonts 2015-06-07 14:01:59 +08:00
simaQ
d6a5d43225 add the introduction of iconfont and button 2015-06-05 20:26:41 +08:00
yiminghe
2567071647 Merge branch 'master' of github.com:ant-design/ant-design 2015-06-05 15:17:15 +08:00
yiminghe
3a9619ed68 update modal 2015-06-05 15:16:55 +08:00
afc163
ba740c2029 typo 2015-06-05 14:53:21 +08:00
yiminghe
d3823e95d2 update modal 2015-06-05 12:05:52 +08:00
afc163
7e4fcfed27 fix instance 2015-06-05 11:41:45 +08:00
afc163
6ca3fd55bb 默认width 2015-06-05 10:47:06 +08:00
afc163
196566039b tweak code 2015-06-05 10:42:47 +08:00
afc163
b16202a329 update modal 2015-06-05 10:39:30 +08:00
yiminghe
31daadf847 update modal 2015-06-04 21:37:56 +08:00
yiminghe
93a8db1b7f update modal 2015-06-04 21:22:34 +08:00
yiminghe
06f63b279b add modal 2015-06-04 21:19:07 +08:00
yiminghe
6b0dd1dffe add modal 2015-06-04 21:17:52 +08:00
afc163
d43d8db6c5 placement demo 2015-06-03 20:46:25 +08:00
afc163
78a6492819 placement demo 2015-06-03 20:43:03 +08:00
afc163
2d35a19606 fix startOfWeek 2015-06-03 20:12:49 +08:00
afc163
805c55dd8f tooltip API 2015-06-03 17:52:44 +08:00
afc163
dd86179825 update index.md 2015-06-03 17:48:52 +08:00
afc163
d8db0ab716 API 2015-06-03 17:47:12 +08:00
afc163
de8a544a31 Add Tooltip 2015-06-03 17:08:51 +08:00
afc163
fb5e2604f5 calendar style 2015-06-03 11:26:53 +08:00
afc163
371f860c14 Update layout 2015-06-02 19:57:33 +08:00
afc163
6842c03762 select demo update 2015-06-02 18:15:32 +08:00
afc163
cafae580f1 code box description change 2015-06-02 17:20:02 +08:00
afc163
08dc95eadc update rc-style repo url 2015-06-02 17:06:50 +08:00
afc163
5651c402a5 update layout 2015-06-02 12:11:49 +08:00
afc163
4f9055a5fe default placeholder 2015-06-01 17:58:02 +08:00
afc163
7fb31b88ea update datepicker doc 2015-05-29 22:40:12 +08:00
afc163
b0cd0adc42 update style 2015-05-29 22:25:04 +08:00
afc163
9ee6b4f204 update API style & add datepicker API 2015-05-29 22:08:29 +08:00
afc163
bb486a6a60 不应该设置默认值 2015-05-29 21:28:01 +08:00
afc163
b0d5b31e11 Time picker 2015-05-29 21:07:46 +08:00
afc163
49cfaae7f2 sketch download link 2015-05-29 16:12:49 +08:00
afc163
fb79f55ff6 code style 2015-05-29 15:29:18 +08:00
afc163
de9b211627 Add datapicker disabled demo 2015-05-29 15:06:45 +08:00
afc163
4793b6979a datapicker demo 2015-05-28 14:53:23 +08:00
afc163
e1f93ed3e5 Add order for code demo 2015-05-27 20:41:16 +08:00
afc163
43ef2dccd3 挖坑 2015-05-27 15:43:29 +08:00
afc163
306d106a08 import rc-style 2015-05-26 17:35:24 +08:00
afc163
17a14faad2 update 2015-05-26 16:19:07 +08:00
afc163
3c5086dc7b datepicker onChange 2015-05-26 13:58:35 +08:00
afc163
03e59b7a77 default value of datepicker 2015-05-26 12:03:49 +08:00
afc163
12a1436abd rm timepick 2015-05-25 18:30:06 +08:00
afc163
31ef99c81d debug mode 2015-05-25 17:20:49 +08:00
afc163
3a2e7034a6 zh-cn 2015-05-22 12:02:56 +08:00
afc163
d08d510f96 components name 2015-05-21 22:24:19 +08:00
afc163
4c121603ec Add datepicker style 2015-05-21 20:36:13 +08:00
afc163
14a2a433d5 update disabled button 2015-05-18 19:54:33 +08:00
afc163
456f796f86 use nico-jsx, allow code type jsx 2015-05-18 18:13:16 +08:00
afc163
9591702f14 update code box template 2015-05-18 17:45:08 +08:00
afc163
2d1187c9ac update code template 2015-05-18 17:33:42 +08:00
afc163
7e05877c13 Add another demo for example 2015-05-16 17:12:22 +08:00
afc163
d83608dff4 read demo from demo folder 2015-05-16 15:03:33 +08:00
afc163
6ff3130f77 layout 2015-05-15 18:03:27 +08:00
afc163
706b657ceb code snipple 2015-05-15 16:00:08 +08:00
afc163
c4023c813f aside 2015-05-12 18:12:48 +08:00
afc163
35e9a4b836 update link 2015-05-12 16:15:39 +08:00
afc163
041ee44ded update style 2015-05-12 15:49:05 +08:00
afc163
5f13503558 aside with category 2015-05-11 18:09:13 +08:00
afc163
72885bd899 update aside style 2015-05-09 18:16:36 +08:00
afc163
08900df2fb rm src 2015-05-07 20:54:19 +08:00