Commit Graph

1107 Commits

Author SHA1 Message Date
xiaosheng.lj
0cc8035678 feat add upload progress effect 2015-11-03 16:59:04 +08:00
yiminghe
052e8ee0f4 upgrade 2015-11-03 13:52:41 +08:00
偏右
6a4743e7ac Merge pull request #433 from ant-design/form-modularization
form 组件
2015-11-02 16:32:04 +08:00
afc163
7c409e54b0 fix datepicker style 2015-11-02 14:46:06 +08:00
afc163
84e71919da Datepicker upgrade 2015-10-31 15:16:05 +08:00
SimaQ
1c1bf9945a 细节修改,保持 dom 结构稳定。 2015-10-31 08:46:15 +08:00
SimaQ
26d9c64f4d fix: 修复通 Validator 结合使用输入失焦的问题。 2015-10-31 08:46:15 +08:00
afc163
dde31cfa1b update spin component 2015-10-31 02:00:03 +08:00
KgTong
b0bad43bf8 Merge remote-tracking branch 'ant/develop-0.10.0' into feature-spin 2015-10-30 13:11:39 +08:00
KgTong
ed91ce0931 use animation judge function, and remove the loading attribute 2015-10-30 11:56:23 +08:00
afc163
e246dfeb06 update datepicker style 2015-10-29 19:59:48 +08:00
afc163
0c96016708 update datepicker style 2015-10-29 19:01:10 +08:00
afc163
25b365d64f update clear btn style of datepicker 2015-10-29 18:19:30 +08:00
偏右
f528017412 Merge pull request #438 from ant-design/develop-0.10.0fortreedynamic
Dynamic Tree
2015-10-29 14:19:30 +08:00
KgTong
852377b6b3 ES6 syntax for spin demo code 2015-10-28 21:40:05 +08:00
afc163
dffbda521c update datepicker demo 2015-10-28 19:48:32 +08:00
KgTong
2e67eae9dd Merge remote-tracking branch 'ant/develop-0.10.0' into feature-spin 2015-10-28 19:33:45 +08:00
KgTong
89517f6e45 support align center and fix compatibility for IE 2015-10-28 19:33:25 +08:00
afc163
56cc2716c1 remove datepicker focus style 2015-10-28 17:30:54 +08:00
afc163
dac4b51ea5 Fix calendar 2015-10-28 16:31:28 +08:00
afc163
8f7c7350e8 Remove today hover color 2015-10-28 15:53:30 +08:00
Benjy Cui
3c962e16d2 fix: hide loading icon at first 2015-10-28 10:35:48 +08:00
ioldfish
49c019f86d Merge branch 'develop-0.10.0' of https://github.com/ant-design/ant-design into develop-0.10.0
Conflicts:
	package.json
2015-10-27 16:28:00 +08:00
afc163
602c2d1f9d support border radius in ie8 via css3pie 2015-10-27 16:26:56 +08:00
ioldfish
8f887d3879 update ant-tree dynamic 2015-10-27 15:47:01 +08:00
KgTong
686a21df78 remove type attribute of spin 2015-10-27 14:58:04 +08:00
KgTong
ea0e9b7d6a fix for code review 2015-10-27 14:01:55 +08:00
KgTong
103104b256 fix conflict 2015-10-27 11:06:15 +08:00
KgTong
b9ce4c7ddf replace the table loading with spin 2015-10-27 10:34:05 +08:00
KgTong
5c1a11710d add spin component 2015-10-27 10:10:27 +08:00
afc163
4f624e1806 Improve chinese font in OSX 2015-10-26 17:47:27 +08:00
afc163
37d18de441 Merge branch 'develop-0.10.0' of github.com:ant-design/ant-design into develop-0.10.0 2015-10-26 16:37:13 +08:00
afc163
62115e9034 just hide toottip overlay when there is no title
avoid rerender children when title is changed
2015-10-26 16:30:27 +08:00
yiminghe
8729808625 upgrade dropdown 2015-10-26 14:26:51 +08:00
afc163
9156b2647c use a big button radius 2015-10-23 23:38:41 +08:00
afc163
f8122309fa Add locale support for datepicker, #424 2015-10-23 17:57:02 +08:00
afc163
b910d353df Add adjust animation for select 2015-10-22 18:27:17 +08:00
afc163
e82cc1b251 Add adjust animation for datepicker 2015-10-22 18:03:27 +08:00
afc163
9df0cd44c4 remove prefix 2015-10-22 17:00:46 +08:00
afc163
c4e552cb60 update tabs style 2015-10-22 11:36:41 +08:00
afc163
b6cdeb157d Add vertical tabs, fix #398 2015-10-21 20:00:02 +08:00
yiminghe
1e43c9ddc5 upgrade tabs 2015-10-21 14:53:48 +08:00
SimaQ
59c36965ea fix: fix slider disabled style bug. 2015-10-20 19:39:43 +08:00
yiminghe
76b0f673ec beta2 2015-10-20 16:47:55 +08:00
afc163
925d75dd1e upgrade rc-slider 2015-10-19 16:54:19 +08:00
afc163
a69aae8696 Merge branch 'master' into develop-0.10.0 2015-10-19 13:56:31 +08:00
afc163
f0e76c2470 Merge branch 'master' into develop-0.10.0 2015-10-19 13:55:43 +08:00
haoxin
57ff6037af fix menu z-index, to be smaller than 1000 (dialog, mask, modal) 2015-10-19 13:12:39 +08:00
Haibin Yu
469231c5e7 fix btn-group mixin bug 2015-10-15 23:36:48 +08:00
SimaQ
89bb950663 fix: 添加 ant-input-number 的校验样式支持。 Closes #377。 2015-10-15 19:59:21 +08:00
afc163
5fd6d98217 Merge branch 'develop-0.10.0' of github.com:ant-design/ant-design into develop-0.10.0 2015-10-14 16:46:01 +08:00
afc163
164c01b5ba Merge branch 'master' into develop-0.10.0 2015-10-14 16:44:52 +08:00
afc163
6092ca2319 upgrade input-number to 2.1.x 2015-10-14 16:27:06 +08:00
Haibin Yu
3faa1535db fix text-color typo in popover.less 2015-10-14 13:28:37 +08:00
afc163
33f152b4ac update steps style 2015-10-09 21:27:28 +08:00
afc163
a4ad6cd1b0 update input-number transition style 2015-10-09 20:52:41 +08:00
Benjy Cui
0183694f9c refactor: remove .ant-btn-menu 2015-10-09 15:16:22 +08:00
Benjy Cui
2f771b0482 feat: button should be a component 2015-10-05 15:19:07 +08:00
afc163
b31fe3e1e2 fix select style 2015-09-24 22:16:28 +08:00
afc163
e36c2412a2 fix select text overflow style, close #338 2015-09-24 21:54:19 +08:00
afc163
ab7f72875a Add expand icon background 2015-09-24 19:14:26 +08:00
afc163
752ef0a141 Make chrome transition animation smoothly 2015-09-23 21:37:11 +08:00
afc163
ce2aeb48a8 improve input number handler 2015-09-23 20:48:08 +08:00
唐帅佶
ffd304bf0c progress bar style bugfix 2015-09-23 11:56:38 +08:00
afc163
374dca4660 Fix user-select in switch control 2015-09-23 11:44:39 +08:00
afc163
8436a1a108 Fix style of search input in select 2015-09-23 11:42:46 +08:00
afc163
f8b587157d show handler when hover input number control 2015-09-23 11:40:18 +08:00
afc163
abf2bbddf3 expand slider handle area 2015-09-23 11:35:44 +08:00
afc163
8a45fe3357 update select dropdown style 2015-09-23 11:21:36 +08:00
afc163
73c1d3f595 update progress demo 2015-09-22 20:11:28 +08:00
afc163
c5cab1d687 Add confirmLoading prop for Modal
You can use `confirmLoading` to cancel button loading status.

```
onOk() {
  ...
  this.setState({
    confirmLoading: false
  });
}
```

Fix #322
2015-09-22 15:06:10 +08:00
afc163
a6eb7413f4 input can not be hidden in IE8, fix #321 2015-09-22 11:17:18 +08:00
afc163
63fa44867c update badge style 2015-09-18 17:24:14 +08:00
afc163
388bf241c5 fix #298 2015-09-18 15:03:04 +08:00
yiminghe
7b4bdc8482 fix placeholder 2015-09-17 19:31:52 +08:00
羽航
2c2919e877 revert. drop "relative" 2015-09-17 16:41:01 +08:00
羽航
b88cb9e060 取消iframe方案 2015-09-17 16:17:32 +08:00
羽航
c28034efa7 update rc-steps v1.3.1 使用iframe来监控resize事件。未来不支持ie8后,再过渡到纯css实现。 2015-09-17 14:18:06 +08:00
afc163
2106387a64 Fix slider tooltip style 2015-09-16 20:51:01 +08:00
afc163
8dd0c1b02d update message z-index 2015-09-16 20:29:59 +08:00
afc163
f96867b640 fix datepicker panel z-index, ref #264 2015-09-16 16:42:24 +08:00
jljsj
7a415fa4c6 update tag animationName 2015-09-16 16:19:07 +08:00
afc163
f0d8f5c55c update menu style and version 2015-09-16 11:29:51 +08:00
afc163
1b032429f8 Fix datepicker panel background overflow 2015-09-15 18:16:34 +08:00
jljsj
4b320fb1dc 把modal的fade移到fade.less,modal的fade缺少appear导至第一次出来没动画 2015-09-15 16:15:07 +08:00
jljsj
872b215930 update motion animation-name 2015-09-15 15:00:23 +08:00
zhujun24
a8f0a2b040 fixed expand table icon position 2015-09-15 12:16:43 +08:00
afc163
88108b9fb9 Fix loading icon position in empty table 2015-09-15 11:40:58 +08:00
afc163
5a094b90df Fix form element reset style 2015-09-14 20:22:31 +08:00
zhujun24
515e294000 fixed flex layout, ref 257 2015-09-13 11:32:42 +08:00
afc163
8c4d3b0618 Remove timeline item min-height 2015-09-12 18:25:38 +08:00
afc163
6b9cceb5a7 Fix checkbox click area 2015-09-12 14:24:48 +08:00
afc163
a1d5030174 rollback blur mask 2015-09-11 17:11:00 +08:00
jljsj
1f5cc32aaa update blur.less 2015-09-11 16:51:20 +08:00
jljsj
9d5bc12db0 add modal bg blur, remove motion blur 2015-09-11 16:46:28 +08:00
jljsj
3474caac0c add zoom bulr, add motion blur to modal 2015-09-11 14:37:39 +08:00
jljsj
c7fd8285c1 updata slide scale(.8). add zoomBig 2015-09-11 14:02:00 +08:00
SimaQ
c5ddeec465 fix: slider 气泡样式问题。 Closes #259 2015-09-11 12:18:54 +08:00
afc163
268da85fcc update select style 2015-09-10 12:27:24 +08:00
afc163
c3ffa14ec5 Change expanded row background color 2015-09-10 12:21:41 +08:00
afc163
b4e98f2f1d Merge branch 'master' of github.com:ant-design/ant-design 2015-09-10 12:08:17 +08:00
afc163
3af86e4286 Fix style of super long tag in multiple select 2015-09-10 12:07:58 +08:00
zhujun24
95465a6794 add expand table 2015-09-10 11:04:31 +08:00
afc163
1056af34a7 Fix multiple select style 2015-09-08 16:38:19 +08:00
afc163
0a9d641a82 Change RadioGroup display to inline-block 2015-09-08 12:10:48 +08:00
afc163
1a3614c72c Fix radio button style 2015-09-07 15:14:57 +08:00
afc163
1e5271491e Add loading message 2015-09-07 12:27:09 +08:00
偏右
478d1e8668 Merge pull request #245 from zhujun24/master
equal height line
2015-09-07 11:51:20 +08:00
afc163
75d710a1b8 Add some info type Modal, close #244 2015-09-07 11:48:57 +08:00
zhujun24
2510a68dca equal height line 2015-09-07 11:31:37 +08:00
zhujun24
4a61592ff6 optimize 2015-09-02 12:12:11 +08:00
afc163
9355052359 update timeline style 2015-09-01 22:20:27 +08:00
afc163
409c9d57fd update timeline style 2015-09-01 21:56:26 +08:00
zhujun24
082104a2ae optimize code 2015-09-01 21:39:29 +08:00
zhujun24
3e3ff021b6 Merge remote-tracking branch 'upstream/master' into component-timeline 2015-09-01 21:15:40 +08:00
zhujun24
018a62886d add timeline 2015-09-01 21:15:31 +08:00
afc163
5516f7866c Fix radio button style 2015-09-01 18:23:46 +08:00
afc163
c6f75d6be4 Fix whitespace 2015-09-01 17:43:42 +08:00
afc163
20ae732f14 update badge style 2015-09-01 17:26:06 +08:00
afc163
3165da4246 update badge 2015-09-01 17:16:51 +08:00
偏右
d60ffeeafe Merge pull request #233 from zhujun24/vertical-steps
restore vertical steps
2015-09-01 16:23:07 +08:00
zhujun24
6f0ba9142e restore vertical steps 2015-09-01 15:30:51 +08:00
afc163
af2425d7d5 Add component badge 2015-09-01 13:59:45 +08:00
zhujun24
dfa34ef999 description font-size 12px 2015-09-01 11:19:59 +08:00
偏右
e0f2eb214e Merge pull request #225 from zhujun24/vertical-steps
Vertical steps
2015-09-01 11:06:06 +08:00
zhujun24
663d3d02fe remove useless style 2015-08-31 20:51:45 +08:00
zhujun24
9a7814396e vertical re-stpes 1.2.1 2015-08-31 20:24:47 +08:00
yiminghe
fbad793d3d upgrade select 2015-08-31 19:41:58 +08:00
afc163
3a5d76ee51 Fix collapse animation 2015-08-31 16:58:27 +08:00
afc163
1ef898e92a fix datepicker panel line-height 2015-08-31 16:43:25 +08:00
zhujun24
d720a908a0 Merge remote-tracking branch 'upstream/master' into vertical-steps 2015-08-31 15:16:02 +08:00
yiminghe
0eb9e95feb revert select style 2015-08-31 12:20:04 +08:00
yiminghe
3ec73ec965 fix open animation 2015-08-31 12:10:54 +08:00
afc163
e45fbaad7f empty table should not have pagination 2015-08-28 17:30:37 +08:00
afc163
4c54644116 Add empty style for table 2015-08-28 17:20:02 +08:00
afc163
f101c3231e Add urlResolver, support display remote file url in list
拿到请求回调数据里的远程文件地址,展示在文件列表中方便下载
2015-08-28 16:12:19 +08:00
zhujun24
b875855652 modify style 2015-08-28 11:09:10 +08:00
zhujun24
3118ee32e3 optimize code 2015-08-27 14:36:02 +08:00
zhujun24
8a99d0bc5a add vertical steps 2015-08-27 13:20:31 +08:00
Hanai
f96f70f685 Update form.less
fix style
2015-08-27 12:48:38 +08:00
jljsj
c83ae1bcfc 修改zoom的缩小点比例 2015-08-27 12:22:49 +08:00
zhujun24
f664275a1e add big vertical steps 2015-08-26 18:28:29 +08:00
afc163
461ffdf421 Fix select demo, close #195 2015-08-26 11:09:43 +08:00
afc163
73e11d9165 Update code font family 2015-08-25 11:48:01 +08:00
然则
af22a48fbb up tree selected style 2015-08-24 20:21:06 +08:00
偏右
adb2843df6 Merge pull request #188 from ant-design/new-menu-animation
Add menu animation
2015-08-24 19:25:38 +08:00
jljsj
6b66ad7dbf 去除行效果了 2015-08-24 18:32:06 +08:00
jljsj
c2be1cbf81 Add menu animation 2015-08-24 18:18:46 +08:00
然则
2df2310296 Merge branch '0.8.0' of github.com:ant-design/ant-design into 0.8.0 2015-08-24 18:14:02 +08:00
然则
d29a215e74 up tree and add velocity-animate 2015-08-24 18:12:07 +08:00
afc163
c9b700aed4 Fix overhigh z-index, #186 2015-08-24 16:38:19 +08:00
afc163
d72b68a804 update select dropdown style 2015-08-24 16:09:18 +08:00
afc163
4897b4d3f5 Add prefix to keyframes 2015-08-24 12:27:13 +08:00
yiminghe
7a6f190e9e upgrade animate 2015-08-24 00:50:22 +08:00
yiminghe
3b3ae23fe2 update animate 2015-08-24 00:31:49 +08:00
翰文
9137920f2d feat: Collapse兼容ie8和Safari
closes #138, #161

Conflicts:
	style/components/collapse.less
2015-08-23 16:31:51 +08:00
偏右
4967d9dfef Merge pull request #183 from zhujun24/fix-ie-safari
fixed collapse IE8/Safari
2015-08-23 15:52:39 +08:00
afc163
eaaca383f8 Fix table filter dropdown style 2015-08-23 15:51:45 +08:00
afc163
36030e269b Fix select style 2015-08-23 15:42:38 +08:00
zhujun24
6d959a601b fixed collapse IE8/Safari 2015-08-23 15:33:15 +08:00
yiminghe
3795111cff Merge branch '0.8.0' of github.com:ant-design/ant-design into 0.8.0 2015-08-21 23:37:32 +08:00
yiminghe
43e948f815 upgrade dropdown 2015-08-21 23:36:10 +08:00
afc163
0d33c0d9e4 Add radio button style 2015-08-21 19:16:03 +08:00
afc163
e23372b6e8 update upload animation code style 2015-08-21 17:37:54 +08:00
jljsj
ab09f9e537 add tag and uploadlist motion 2015-08-21 17:12:42 +08:00
然则
d7b4bbb289 Merge branch '0.8.0' of github.com:ant-design/ant-design into 0.8.0 2015-08-21 16:19:49 +08:00
然则
87bbaea8d9 fixed #138 not full 2015-08-21 16:19:17 +08:00
偏右
fd3b22a1f9 Merge pull request #178 from zhujun24/fix-datepicker
fixed datepicker time panel border
2015-08-21 15:39:50 +08:00
zhujun24
956061f119 fixed Datepicker time panel border 2015-08-21 15:33:49 +08:00
afc163
d100fd4fa8 Merge branch '0.8.0' of github.com:ant-design/ant-design into 0.8.0 2015-08-21 15:15:58 +08:00
afc163
b32fc009b1 Fix select style 2015-08-21 15:14:21 +08:00
yiminghe
d69f22ba5d Merge branch '0.8.0' of github.com:ant-design/ant-design into 0.8.0 2015-08-21 14:54:56 +08:00
yiminghe
c4b5b186ae render to body 2015-08-21 14:54:37 +08:00
afc163
10284a997c Fix upload bug in safari and ie8/9, ref #138 2015-08-21 14:46:12 +08:00
afc163
b48e54cd66 update iconfont and adjust some icon size 2015-08-20 20:52:16 +08:00
afc163
42c6a05a38 Merge branch '0.8.0' of github.com:ant-design/ant-design into 0.8.0 2015-08-20 20:31:05 +08:00
afc163
01c5f1675a code style 2015-08-20 18:09:28 +08:00
yiminghe
fd0083e6e3 Merge branch '0.8.0' of github.com:ant-design/ant-design into 0.8.0 2015-08-20 17:47:15 +08:00
yiminghe
0a1cfccd22 upgrade select. Fixes #170 2015-08-20 17:46:12 +08:00
afc163
2940cd2696 fix build 2015-08-20 17:01:57 +08:00
afc163
75e3a6c561 Merge branch '0.8.0' into lesslint 2015-08-20 16:56:24 +08:00
afc163
f0931ece66 Add lesslint and fix less code style 2015-08-20 16:55:42 +08:00
yiminghe
d2e7253c51 fix tabs style 2015-08-20 16:47:41 +08:00
偏右
400f23939d Merge pull request #164 from zhujun24/fix-ie
input-number arrow
2015-08-20 16:28:28 +08:00
SimaQ
0a2424f52a Merge branch '0.8.0' of https://github.com/ant-design/ant-design into 0.8.0 2015-08-20 15:48:01 +08:00
SimaQ
fcc8785e93 fix: fix datepicker style bug in inline-form. 2015-08-20 15:47:13 +08:00
zhujun24
a2c573cb5a fixed collape margin, ref #138 2015-08-20 15:45:16 +08:00
zhujun24
6bdf0c4974 fixed inputNumber arrow, ref #138 2015-08-20 15:38:57 +08:00
jljsj
02b6112946 Merge branch '0.8.0' of github.com:ant-design/ant-design into 0.8.0 2015-08-20 14:58:33 +08:00
jljsj
13da44faa1 add validation icon motion 2015-08-20 14:58:09 +08:00
afc163
970aa4f846 Update code style 2015-08-20 13:17:17 +08:00
jljsj
8274cce09e add alert close animation 2015-08-20 13:06:47 +08:00
然则
10c6a84874 up tree and checkbox style 2015-08-19 21:19:11 +08:00
然则
98407fef15 ie8 fix 2015-08-19 20:42:34 +08:00
afc163
8c91030b01 submenu hover background bug 2015-08-19 19:26:28 +08:00
afc163
13fd2d8b46 Fix root menu hover bug 2015-08-19 19:23:30 +08:00
afc163
733307d3de Fix menu hover background 2015-08-19 18:59:08 +08:00
afc163
3d975e4495 code style 2015-08-19 17:50:20 +08:00
jljsj
ac27a1814d add tag animation 2015-08-19 17:26:55 +08:00
afc163
d612c82fda Remove overflow:hidden from table container 2015-08-19 16:10:08 +08:00
jljsj
eb0ecaa035 Merge branch '0.8.0' of github.com:ant-design/ant-design into 0.8.0 2015-08-19 15:46:44 +08:00
jljsj
25c8df1db6 updata easeing add quint 2015-08-19 15:46:33 +08:00
afc163
29de017602 fix iconfont position bug in safari 2015-08-19 15:28:22 +08:00
然则
2bcd7ef34f Merge branch '0.8.0' of github.com:ant-design/ant-design into 0.8.0 2015-08-19 12:23:28 +08:00
然则
3bba2b7972 fix conflict 2015-08-19 12:23:00 +08:00
afc163
d46b790493 update slider style 2015-08-19 12:20:03 +08:00
然则
011970fe38 up tree api 2015-08-19 12:18:10 +08:00
afc163
568a23930c anticon-large => anticon-appstore 2015-08-19 11:31:14 +08:00
afc163
3b658406bb improve menu style 2015-08-18 22:51:01 +08:00
afc163
37ead7359c cursor text over placeholder 2015-08-18 22:47:23 +08:00
afc163
7fa9d6a6e8 Fix table header text align, ref #138 2015-08-18 17:48:24 +08:00
afc163
6b305b3b30 Merge branch '0.8.0' of github.com:ant-design/ant-design into 0.8.0 2015-08-18 17:20:39 +08:00
afc163
24aba9ea24 Fix table header text align, ref #138 2015-08-18 17:18:49 +08:00
SimaQ
552da03f3b Merge branch '0.8.0' of https://github.com/ant-design/ant-design into 0.8.0 2015-08-18 17:15:30 +08:00
SimaQ
b99dffbd09 fix: fix Browser compatibility for .ant-form-inline. 2015-08-18 17:15:08 +08:00
afc163
542883515a Fix inline menu arrow direction 2015-08-18 16:39:26 +08:00
afc163
42de63ad08 Merge branch '0.8.0' of github.com:ant-design/ant-design into 0.8.0 2015-08-18 16:04:03 +08:00
afc163
90deb00e06 update tree code and demo style, improve css 2015-08-18 16:03:13 +08:00
zhujun24
34466d2dde fix dropdown border-top IE8 2015-08-18 15:31:08 +08:00
zhujun24
862036b1d5 fix tabs left arrow color IE9 2015-08-18 14:58:18 +08:00
偏右
363ecca6b6 Merge pull request #155 from ant-design/fix-pagination-center
修复分页组件在 IE8 不能居中的问题
2015-08-18 14:41:06 +08:00
Yuwei Ba
b95df15f7b 修复分页组件在 IE8 不能居中的问题 2015-08-18 14:31:00 +08:00
yiminghe
d087793cdf fix menu expander 2015-08-18 14:28:28 +08:00
Yuwei Ba
a77e5085de Fix quirk color in IE9.
Disable IE filter.
2015-08-18 13:40:38 +08:00
yiminghe
a15e428155 fix select placeholder for ie10. Fixes #145 2015-08-18 00:42:03 +08:00
yiminghe
099999ffc1 support mousePosition 2015-08-17 23:46:09 +08:00
yiminghe
867c4f2a85 support mousePosition 2015-08-17 23:42:52 +08:00
afc163
f31f6f2b8e fix ie8 opacity 2015-08-17 20:44:40 +08:00
afc163
659f373899 fix filter menu style in table 2015-08-17 18:04:46 +08:00
ioldfish
cb2a711ee2 Merge branch '0.8.0' of https://github.com/ant-design/ant-design into 0.8.0 2015-08-17 17:35:27 +08:00
ioldfish
1b78c4fc90 merge from fortree 2015-08-17 17:32:59 +08:00
afc163
662f8889bf fix menu-item link, #139 2015-08-17 17:28:48 +08:00
ioldfish
cbcceab1e9 fix style 2015-08-17 12:50:02 +08:00
afc163
72e001117c update collaspe arrow animation 2015-08-17 12:27:03 +08:00
然则
4b705d7c85 up less 2015-08-17 12:17:20 +08:00
然则
ad02ebe114 up mixin fn 2015-08-17 00:24:39 +08:00
然则
23948c8588 up checkbox 2015-08-16 20:38:58 +08:00
然则
bf52026789 up tree and checkbox 2015-08-16 20:04:42 +08:00
然则
61f061b00f up api 2015-08-15 23:45:25 +08:00
yiminghe
fea0870a41 update menu 2015-08-15 00:07:40 +08:00
然则
82bf118a73 up iconfont 2015-08-14 23:28:20 +08:00
afc163
0d4e396f2a fix select check size 2015-08-14 18:30:54 +08:00
afc163
de38390271 改进 menu 的样式
参照 ant-design 的视觉稿微调
2015-08-14 18:16:41 +08:00
yiminghe
ac50ae3632 upgrade menu 2015-08-14 13:09:53 +08:00
yiminghe
f4b0a8fee8 update menu style 2015-08-13 17:31:09 +08:00
yiminghe
b3af79ab24 upgrade. Fixes #127 2015-08-13 16:39:51 +08:00
偏右
622e39cfa3 Merge pull request #128 from zhujun24/notification
Notification
2015-08-12 18:19:43 +08:00
zhujun24
ba2c4cf4ff fixed notification animate bug 2015-08-12 18:08:06 +08:00
afc163
f975a891a6 selected check style should be in select-dropdown rather than dropdown 2015-08-12 16:18:15 +08:00
afc163
3ad54f42e0 @link-color split from @primary-color 2015-08-11 21:25:25 +08:00
afc163
f0c77e7004 update color var 2015-08-11 21:16:12 +08:00
afc163
137e40acae bordered table 2015-08-11 20:05:52 +08:00
然则
6da7db4ec2 up rc-tree version 2015-08-10 20:23:18 +08:00
yiminghe
6bba4f755c Merge branch '0.8.0' of github.com:ant-design/ant-design into 0.8.0 2015-08-10 17:57:52 +08:00
yiminghe
eef1da7ed6 upgrade menu 2015-08-10 17:57:28 +08:00
afc163
e7ca8c9af8 react-component/select#19 2015-08-10 16:35:51 +08:00
偏右
df8ccf6d46 Merge pull request #121 from zhujun24/input-size
Input size
2015-08-10 16:21:00 +08:00
zhujun24
dee35bd833 optimize code style 2015-08-10 15:39:50 +08:00
afc163
dae05a55c4 merge 2015-08-09 18:05:50 +08:00
afc163
b68ec83e36 优化 upload 实现
1. 使用 Upload.dragger 代替 type
2. 将拖拽上传的内容区域交给用户自己实现
3. 改进 uploadList 的实现方式, 尽量避免使用 Dom 操作
4. 优化样式展现
2015-08-09 18:00:20 +08:00
玄寂
63cf7bb742 feat: add upload component 2015-08-08 23:37:35 +08:00
zhujun24
e3e17376f0 selece size 2015-08-08 19:11:10 +08:00
zhujun24
7b64e31ea3 inputNumber size 2015-08-08 17:59:57 +08:00
yiminghe
aa6722b0d2 upgrade slider 2015-08-08 00:49:48 +08:00
afc163
bba4f9df42 ant-affix 2015-08-07 11:04:22 +08:00
yiminghe
9616341007 Merge branch '0.8.0' of github.com:ant-design/ant-design into 0.8.0 2015-08-06 16:50:20 +08:00
yiminghe
4d203b6e67 add menu 2015-08-06 16:49:54 +08:00
afc163
c2933a8e52 update tabs style 2015-08-06 16:47:01 +08:00
ioldfish
817e5ff72a upadte tree style 2015-08-06 09:17:40 +08:00
SimaQ
2e47b732c0 Merge branch '0.8.0' of https://github.com/ant-design/ant-design into 0.8.0 2015-08-05 17:56:26 +08:00
SimaQ
1d6f5a88ae remove the clear button of a text input control in IE10 and plus 2015-08-05 17:54:19 +08:00
SimaQ
5a47d35d1e fix: required label style has bug in ie 2015-08-05 16:56:41 +08:00
afc163
df7aa84191 fix datepicker style in form item 2015-08-04 20:22:45 +08:00
yiminghe
0e58688dc2 fix adjustOrientOnCalendarOverflow 2015-08-04 18:42:41 +08:00
afc163
5c9f8e60ea Merge branch '0.8.0' of github.com:ant-design/ant-design into 0.8.0 2015-08-04 16:54:25 +08:00
afc163
164e7c3c30 update markdown style 2015-08-04 16:53:41 +08:00
yiminghe
ebc4aac58e fix notification 2015-08-04 15:16:10 +08:00
SimaQ
5c9fdbaeb6 Merge branch '0.8.0' of https://github.com/ant-design/ant-design into 0.8.0 2015-08-04 14:42:05 +08:00
SimaQ
48c4d24434 modify ant-input-lg's font-size 2015-08-04 14:41:30 +08:00
偏右
2fe97eb8ee Merge pull request #88 from zhujun24/notification
Notification
2015-08-04 11:45:40 +08:00
sorrycc
830e503218 remove css prefix 2015-08-03 17:49:09 +08:00
sorrycc
cb1ce102ff move style declaractions under .ant-carousel 2015-08-03 17:45:58 +08:00
sorrycc
6b7f2e543b dots element take place 2015-08-03 17:43:06 +08:00
sorrycc
ebf1c3ed25 add Carousel 2015-08-03 17:43:05 +08:00
afc163
3bf5a86c21 fix select group style 2015-08-03 16:43:23 +08:00
ioldfish
c18af7db79 包装rc-tree,样式待修改 2015-08-03 16:07:21 +08:00
zhujun24
0a79201536 merge conflict index.js 2015-08-03 15:22:04 +08:00
zhujun24
4ef0ac9e9b add icon style and top 2015-08-03 15:17:12 +08:00
SimaQ
5f70cf024a feat: add form-validation 2015-08-03 13:39:58 +08:00
zhujun24
95c098e61f merge 0.8.0 2015-08-03 09:47:59 +08:00
然则
fcd8a7fd3f fix #99 2015-08-01 17:51:55 +08:00
zhujun24
a4f6890dec merge 0.8.0 2015-07-31 18:19:36 +08:00
afc163
f586514cd7 update progress style 2015-07-30 18:39:52 +08:00
偏右
9656efd720 Merge pull request #97 from ant-design/progress-bar
增加showInfo配置
2015-07-30 18:20:54 +08:00
夏奈
fc9e268cfa showInfo 是否显示数值配置 2015-07-30 18:19:56 +08:00
夏奈
bbac575112 showInfo 是否显示数值配置 2015-07-30 17:27:41 +08:00
夏奈
7703b57882 transition 2015-07-30 16:26:42 +08:00
偏右
714c5faa1c Merge pull request #96 from ant-design/progress-bar
Progress bar
2015-07-30 16:12:49 +08:00
夏奈
1bb6711a00 颜色修改 2015-07-30 15:54:08 +08:00
夏奈
df16cc2118 progress bar active 2015-07-30 15:07:38 +08:00
偏右
4135a00e79 Merge pull request #84 from ant-design/components-tag
Components tag
2015-07-30 13:01:09 +08:00
afc163
43c53f1d8d loading button should be unhandlable 2015-07-30 11:15:03 +08:00
afc163
741b7f2896 Merge branch 'master' into 0.8.0 2015-07-30 11:00:11 +08:00
afc163
e067bcd7a5 merge from 0.8.0 2015-07-30 10:52:30 +08:00
zhujun24
26df3480ff Merge branch 'alert' into notification 2015-07-30 10:50:11 +08:00
夏奈
ef3f753470 progress bar style 2015-07-29 23:32:24 +08:00
afc163
b8ef693afc button loading animation effect 2015-07-29 22:23:55 +08:00
夏奈
a85586844c progress bar style 2015-07-29 22:20:05 +08:00
zhujun24
718751d063 merge 0.8.0 2015-07-29 21:07:02 +08:00
zhujun24
42024530d0 notification 2015-07-29 20:08:16 +08:00
zhujun24
cdbbc4d34e fixed three problems 2015-07-29 17:22:36 +08:00
yiminghe
4c0cbd846c fix tabs anim 2015-07-29 16:49:05 +08:00
afc163
d13a565b3d update component style 2015-07-29 16:00:18 +08:00
zhujun24
2eb253f0ed fixed close style 2015-07-29 15:22:47 +08:00
zhujun24
c494da18aa optimize alert 2015-07-29 10:27:31 +08:00
afc163
2e0be628a7 update tag style 2015-07-28 20:03:10 +08:00
zhujun24
19a2604b71 notification half 2015-07-28 15:40:28 +08:00
zhujun24
405b85b60b close icon style 2015-07-28 14:52:01 +08:00
zhujun24
eea48ffe16 Alert component 2015-07-27 20:53:08 +08:00
SimaQ
70d2a21755 set max-width for textarea 2015-07-27 08:52:47 +08:00
afc163
0bd869bbc2 iconfont 2015-07-26 15:05:32 +08:00
yuche
0ef29107ed change collapse header's cursor to pointer 2015-07-24 22:07:59 +08:00
afc163
37a114d49f fix select arrow position in form-item 2015-07-24 16:24:23 +08:00
afc163
53c33bd6e7 fix select arrow position in form-item 2015-07-24 16:08:44 +08:00
afc163
47c06ef141 优化了 checkbox 的动画, 使其更流畅一些 2015-07-24 11:13:28 +08:00
afc163
e2422ae498 improved select arrow position implementation 2015-07-23 17:18:09 +08:00
afc163
6805ff4d64 cubic-bezier variable 2015-07-23 15:04:12 +08:00
afc163
0d0e07a3a6 update box-shadow and border 2015-07-23 14:56:14 +08:00
afc163
100cb89ff8 Merge branch 'master' of github.com:ant-design/ant-design 2015-07-22 19:26:21 +08:00
afc163
41997668ea modify input border-color to primary-color tint 20% 2015-07-22 19:25:35 +08:00
然则
f79dfc0bcd 多选选中 没底色 只有勾 2015-07-22 19:05:59 +08:00
SimaQ
9cdd37a921 modify the icon size of select 2015-07-22 17:36:14 +08:00
SimaQ
7eb73e0714 Merge branch 'master' of https://github.com/ant-design/ant-design 2015-07-22 17:18:26 +08:00
SimaQ
bf1cf10adf update form typography 2015-07-22 17:17:47 +08:00
afc163
880bf061b1 remove min height in table 2015-07-22 16:55:52 +08:00
翰文
be3d529917 chore: collapse样式调整 2015-07-21 20:53:36 +08:00
afc163
a274d8088b color 2015-07-21 17:39:19 +08:00
afc163
43f221ca32 unused file 2015-07-21 17:33:29 +08:00
玄寂
bf0187fdbd chore: modify message component border color 2015-07-21 16:04:08 +08:00
afc163
de8e0918ac title color diff from text color 2015-07-21 15:29:47 +08:00
afc163
22a44ff32a Merge branch 'master' of github.com:ant-design/ant-design 2015-07-21 15:19:07 +08:00
afc163
0ee4a5b49a fix text color to #666 2015-07-21 15:17:42 +08:00
afc163
4952c4e05d code indent 2015-07-21 15:11:36 +08:00
SimaQ
cd3d87819e Merge branch 'master' of https://github.com/ant-design/ant-design 2015-07-21 14:58:29 +08:00
SimaQ
b256f4c4f4 update 2015-07-21 14:56:03 +08:00
SimaQ
4e4567c9e8 update ant-input-group style 2015-07-21 14:54:49 +08:00
afc163
4be73afd2d 微调了input-number在chrome下的效果 2015-07-21 14:28:29 +08:00
afc163
3c8117f85f left padding-right for selected check icon in multiple select 2015-07-21 10:59:47 +08:00
羽航
cbd61bb087 样式微调 2015-07-21 09:46:35 +08:00
afc163
a4589b4ddd update select style 2015-07-20 22:56:43 +08:00
afc163
f85b235c1e remove comment code 2015-07-20 22:31:22 +08:00
然则
53763092a7 Merge branch 'master' of github.com:ant-design/ant-design 2015-07-20 21:33:07 +08:00
然则
d1a0737964 使select单选时不打钩 2015-07-20 21:32:31 +08:00
SimaQ
5042c2d7a7 Merge branch 'master' of https://github.com/ant-design/ant-design 2015-07-20 20:37:32 +08:00
SimaQ
745b6d3be2 form demo update: change radio checkbox select to ant-radio ant-checkbox ant-select 2015-07-20 20:35:48 +08:00
afc163
b90f83ed8a update default width 2015-07-20 20:03:45 +08:00
SimaQ
7eaaee8a0b update form style 2015-07-20 19:25:34 +08:00
SimaQ
9fe92d9735 update form demo 2015-07-20 17:43:01 +08:00
SimaQ
d202aebdea Merge branch 'master' of https://github.com/ant-design/ant-design 2015-07-20 17:29:00 +08:00
SimaQ
9bceed63a4 update input-number style 2015-07-20 17:28:29 +08:00
afc163
e865099305 update pagination 2015-07-20 17:06:19 +08:00
SimaQ
cb4008733b Merge branch 'master' of https://github.com/ant-design/ant-design 2015-07-20 16:45:01 +08:00
SimaQ
88118e97b9 fix extra padding under textarea 2015-07-20 16:44:39 +08:00
Yuwei Ba
75960d4f2a 修复 pagination 偏移 2015-07-20 16:29:34 +08:00
SimaQ
ef6067c5b3 Merge branch 'master' of https://github.com/ant-design/ant-design 2015-07-20 16:09:30 +08:00
SimaQ
ac14eef84c update form style 2015-07-20 16:06:10 +08:00
SimaQ
a5d3618d2e add width:100% for datepicker stylr 2015-07-20 16:05:39 +08:00
偏右
91f9b4ca6e Merge pull request #53 from ant-design/pagination 2015-07-20 16:02:26 +08:00
Yuwei Ba
44c5f8cfca use cross-rotate() 2015-07-20 16:01:04 +08:00
Yuwei Ba
8c22dac4ae Fix scale 2015-07-20 15:58:42 +08:00
afc163
b856228e13 fix iconfont-size mixin 2015-07-20 15:32:47 +08:00
afc163
d9cd12cdb6 update selected style 2015-07-20 15:31:28 +08:00
Yuwei Ba
4967196f0d Use iconfont-size mixin; 2015-07-20 15:16:05 +08:00
Yuwei Ba
2a53e9f745 Adjust pagination jump button style. 2015-07-20 15:01:00 +08:00
Yuwei Ba
46f00868d1 Use anticon. 2015-07-20 14:55:52 +08:00
yiminghe
70fc084e44 update switch 2015-07-20 14:32:21 +08:00
afc163
ccaa037969 add rotate minin for all browsers 2015-07-20 12:03:01 +08:00
afc163
07fb9aa51b fix chrome 12px via .iconfont-size-under-12px() mixin 2015-07-20 11:46:48 +08:00
afc163
3f55dc21a3 fix pagination style 2015-07-17 19:59:47 +08:00
afc163
54320296ba code style, remove blank lines 2015-07-17 19:49:27 +08:00
jljsj
3aa232f6fe update zoom remove enter opacity 2015-07-17 17:57:01 +08:00
jljsj
8a89010663 Merge branch 'master' of github.com:ant-design/ant-design 2015-07-17 17:34:24 +08:00
jljsj
955ddb8d0f updata motion zomm remove opacity:1 2015-07-17 17:33:53 +08:00
afc163
d7f3f571dc Merge branch 'master' of github.com:ant-design/ant-design 2015-07-17 17:32:11 +08:00
afc163
ddc3f83d76 update radio 2015-07-17 17:31:56 +08:00
jljsj
963e5c98d7 update switch ease 2015-07-17 17:21:04 +08:00
jljsj
491a9c8048 update checkbox motion 2015-07-17 16:48:01 +08:00
jljsj
5701436909 update radiogroup css 2015-07-17 16:23:16 +08:00
jljsj
bb7f732a4f Merge branch 'master' of github.com:ant-design/ant-design 2015-07-17 16:07:17 +08:00
jljsj
2af7486e4f Add radio group 2015-07-17 16:06:46 +08:00
simaQ
a75af9ad78 update form 2015-07-17 15:43:31 +08:00
simaQ
000bfde36e update slider stylr 2015-07-17 15:36:12 +08:00
simaQ
36fece79e5 update form style 2015-07-17 15:05:12 +08:00
afc163
6ce068a310 update iconfont 2015-07-17 13:38:17 +08:00
afc163
b94e7541f6 update style 2015-07-17 12:32:43 +08:00
afc163
0e9335246c fix checkbox and radio 2015-07-17 11:06:38 +08:00
afc163
fc70c60d5b update form style 2015-07-16 22:57:47 +08:00
afc163
4e269602f9 fix checkbox and radio style 2015-07-16 22:48:53 +08:00
jljsj
6c99ebb170 update radio 2015-07-16 18:26:17 +08:00
jljsj
200b856bba add radio 2015-07-16 18:23:25 +08:00
simaQ
d5b5895301 update form demo 2015-07-16 15:20:06 +08:00
afc163
db51898720 fix form style 2015-07-16 14:18:03 +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
afc163
86b722671a update checkbox style 2015-07-16 12:27:04 +08:00
afc163
b82e8fc50f Merge branch 'master' of github.com:ant-design/ant-design 2015-07-16 12:21:40 +08:00
afc163
a6087c09ad improve pagination style 2015-07-16 12:21:16 +08:00
yiminghe
687493e5a9 Merge branch 'master' of github.com:ant-design/ant-design 2015-07-16 12:20:44 +08:00
yiminghe
5ffcbfefb4 fix checkbox style 2015-07-16 12:20:14 +08:00
afc163
839ffd9160 improve pagination style 2015-07-16 12:18:20 +08:00
afc163
446c35602f fix popover title height 2015-07-16 12:10:13 +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
0db5c92ca2 error input focus style 2015-07-16 10:48:24 +08:00
simaQ
efd35ed7aa update slider style 2015-07-16 10:36:24 +08:00
simaQ
1dfb2958da update slider 2015-07-16 10:17:11 +08:00
yiminghe
3777933020 fix select style 2015-07-15 19:59:54 +08:00
yiminghe
80886d6563 replace search 2015-07-15 19:32:03 +08:00
afc163
48a27c8ab1 update table style 2015-07-15 18:01:56 +08:00
afc163
91a749a810 move ant-checkbox into ant-form-item 2015-07-15 17:22:58 +08:00
afc163
726197c45e improve pagination item transition effect 2015-07-15 16:34:08 +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
Yuwei Ba
ccaa541ec4 更新 Pagination slash 样式 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
d1ef33e45d arrow size and rotate 2015-07-15 15:19:04 +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
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
afc163
35c5ac8efa update table row-selection style 2015-07-15 11:12:17 +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
afc163
2a41f0802b Merge master to components-table 2015-07-14 21:01:42 +08:00
afc163
0e7f42937f update filter dropdown function and style 2015-07-14 20:43:27 +08:00
yiminghe
c7436301e8 fix less 2015-07-14 20:26:31 +08:00
afc163
21ebe2a8bb Merge branch 'master' into components-table 2015-07-14 16:53:13 +08:00
afc163
bdd9e33565 improve pagination style 2015-07-14 16:50:08 +08:00
afc163
518bf992ba Merge branch 'master' into components-table 2015-07-14 16:12:30 +08:00
偏右
9691d70334 Merge pull request #41 from ibigbug/master
更新一些样式
2015-07-14 16:10:46 +08:00
afc163
c915a3989b merge master to components-table 2015-07-14 15:37:19 +08:00