Commit Graph

24131 Commits

Author SHA1 Message Date
afc163
11499d54d5 Merge branch master into develop-1.0.0 2016-04-27 11:25:32 +08:00
afc163
16a702f5a0 Merge branch 'master' into develop-1.0.0 2016-04-27 11:25:16 +08:00
afc163
48f74fd5bd fix missing Option (#1521) 2016-04-27 11:23:18 +08:00
Marshall Chen
972cfa7a8b Missing Option const (#1522)
cause Option is not defined error
2016-04-27 11:20:58 +08:00
Benjy Cui
22e35544b6 fix: should not cache formatter, close #1509 2016-04-27 11:15:20 +08:00
Benjy Cui
055619a896 site: add not found page (#1518) 2016-04-27 10:56:17 +08:00
afc163
7a064f543e fix markdown style 2016-04-26 18:21:35 +08:00
afc163
0d64b1f60b Merge branch 'develop-1.0.0' of github.com:ant-design/ant-design into develop-1.0.0 2016-04-26 16:14:58 +08:00
Benjy Cui
9c3be4c147 css: add focus style for Radio && Checkbox (#1508) 2016-04-26 16:14:40 +08:00
afc163
2effeac604 fix markdown style 2016-04-26 16:14:07 +08:00
afc163
522d5acb22 Merge branch 'master' into develop-1.0.0 2016-04-26 15:29:27 +08:00
afc163
010e92da79 fix a form warning style problem 2016-04-26 15:25:25 +08:00
afc163
52d5026229 Merge branch 'develop-1.0.0' of github.com:ant-design/ant-design into develop-1.0.0 2016-04-26 14:54:54 +08:00
Leon Shi
baac12d1c4 fix lint (#1513)
* fix lint `prefer-stateless-function`

* fix lint `arrow-body-style`
2016-04-26 14:09:19 +08:00
afc163
5253cf9d66 add blank 2016-04-26 11:28:12 +08:00
afc163
293812098a Merge branch master into develop-1.0.0 2016-04-25 19:34:01 +08:00
偏右
1ab292e335 Merge branch 'master' of github.com:ant-design/ant-design 2016-04-25 19:31:10 +08:00
afc163
0805d4365d update locale demo 2016-04-25 19:27:02 +08:00
afc163
14f857b7ac prevent propagation of Table rowSelection controls, close #1470, close #1507 2016-04-25 17:55:45 +08:00
afc163
c5831310ac Merge branch 'master' into develop-1.0.0 2016-04-25 16:31:46 +08:00
afc163
3789fda6ee fix lint 2016-04-25 16:31:32 +08:00
afc163
7426233425 remove unused code 2016-04-25 16:27:47 +08:00
afc163
5f75a63e8e Merge branch 'master' into develop-1.0.0 2016-04-25 16:26:59 +08:00
afc163
287c45292d fix color of form help text 2016-04-25 16:25:57 +08:00
Benjy Cui
9df9426bf5 css: improve Slider's style #1325 2016-04-25 15:26:40 +08:00
afc163
45441b9a9a Merge branch 'master' into develop-1.0.0 2016-04-25 15:13:24 +08:00
afc163
112317e0ea upgrade iconfont url for export icon 2016-04-25 15:03:34 +08:00
afc163
f9153e7b88 Merge branch master into develop-1.0.0 2016-04-25 13:51:18 +08:00
afc163
d7ee4bffa1 Fix initial selectedRowKeys, close #1501 2016-04-25 13:47:08 +08:00
afc163
9bda9068b1 rm unused code 2016-04-24 17:08:27 +08:00
afc163
4bbb55f070 Merge branch 'master' into develop-1.0.0 2016-04-24 15:57:18 +08:00
afc163
255c0b81d0 Fix Collapse animation of safari, close #1494 2016-04-24 15:29:12 +08:00
afc163
49f0833674 update highlight code style 2016-04-23 16:09:22 +08:00
Sebastian Blade
e5118a9b1c Update dropdown.less (#1491)
去除 menu 中的 `overflow: hidden` (会导致子菜单无法显示)
改为用伪类 `only-child`
2016-04-23 15:30:23 +08:00
yiminghe
eb7708c8db v15. Fixes #1252 2016-04-23 01:03:15 +08:00
yiminghe
d78940813c Merge pull request #1472 from bang88/typings
add typings
2016-04-22 08:49:21 -07:00
本杰
af53f393bf Merge branch 'master' of github.com:ant-design/ant-design 2016-04-22 17:45:29 +08:00
yiminghe
74759ae64f Merge pull request #1485 from ant-design/fix-select
css: clear should be hidden if Select is disabled #1480
2016-04-22 00:52:34 -07:00
Benjy Cui
e767edcb73 css: clear should be hidden if Select is disabled #1480 2016-04-22 15:41:52 +08:00
yiminghe
94bd188713 Merge pull request #1477 from blade254353074/patch-3
Update dropdown.less
2016-04-21 21:13:25 -07:00
yiminghe
bcbecca040 Merge pull request #1479 from ant-design/refactor-highlight
site: replace highlight.js with Prism.js
2016-04-21 21:12:46 -07:00
Benjy Cui
4d64a16b48 site: replace highlight.js with Prism.js 2016-04-22 10:56:12 +08:00
bang
1ce377d2a4 update README.md 2016-04-22 09:40:11 +08:00
bang
5ec0392c1e update package.json's files 2016-04-22 09:37:31 +08:00
Sebastian Blade
765ea2dbeb Update dropdown.less
给 menu 添加 overflow: hidden

避免只有一条 Menu.Item 时,hover 样式超出 menu 的圆角
2016-04-22 00:37:47 +08:00
yiminghe
2483ca5351 use RUN_ENV 2016-04-21 20:32:36 +08:00
yiminghe
ace39a464e optimize site 2016-04-21 20:06:35 +08:00
bang
b78295c567 add typings 2016-04-21 15:52:54 +08:00
afc163
f87ec5248e Merge branch 'develop-1.0.0' of github.com:ant-design/ant-design into develop-1.0.0 2016-04-21 15:16:42 +08:00
afc163
540644826f Merge branch master into develop-1.0.0 2016-04-21 15:14:13 +08:00