Commit Graph

1004 Commits

Author SHA1 Message Date
然则
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
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
yiminghe
a15e428155 fix select placeholder for ie10. Fixes #145 2015-08-18 00:42:03 +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
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
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
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
玄寂
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
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
9bceed63a4 update input-number style 2015-07-20 17:28:29 +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
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
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
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
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
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
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
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
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
afc163
7ea054b3ff update table API, local data mode finished 2015-07-14 15:35:17 +08:00
羽航
2651589101 fix conflict 2015-07-14 13:45:47 +08:00
羽航
778634788d 调整steps的样式 2015-07-14 13:43:25 +08:00
Yuwei Ba
f93f9ee931 更新一些样式 2015-07-14 12:10:44 +08:00
simaQ
4807c3a0ad update slider style 2015-07-14 12:07: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
c93ca8af80 update filter dropdown style 2015-07-13 19:41:33 +08:00
afc163
e982ab46ae improve filter 2015-07-13 18:42:08 +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
56e59c939e update datepicker style 2015-07-13 17:13:23 +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
7a26598059 添加简洁的分页 2015-07-13 16:04:07 +08:00
Yuwei Ba
1091ab0bfb 迷你版本樣式 2015-07-13 14:58:26 +08:00
Yuwei Ba
fd5a8698c6 更新樣式 2015-07-13 12:24:14 +08:00
afc163
01483740b3 merge from master 2015-07-13 10:57:34 +08:00
simaQ
349061b711 add slider into antd 2015-07-13 07:59:38 +08:00
Yuwei Ba
27c6e03322 添加分页组件 2015-07-13 01:05:25 +08:00
afc163
6da3a29c07 small size table 2015-07-12 18:14:17 +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
ce1d6705a4 fix top 2015-07-11 18:22:35 +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
afc163
4e6909e5c1 Merge branch 'master' of github.com:ant-design/ant-design 2015-07-11 17:44:41 +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
afc163
783c5a6c14 Merge branch 'master' of github.com:ant-design/ant-design 2015-07-11 13:08:31 +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
yiminghe
2a49e993f1 remove ms-transform 2015-07-11 01:27:34 +08:00
Benjy Cui
83b5e34039 Update iconfont and relative code. 2015-07-10 16:16:32 +08:00
afc163
40bc7e3268 merge branch master 2015-07-10 10:48:59 +08:00
afc163
86f219de1c Merge branch 'master' of github.com:ant-design/ant-design 2015-07-10 10:35:05 +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
be820a90a8 transition in steps 2015-07-09 20:54:55 +08:00
afc163
8dfd817fb2 垂直居中 2015-07-09 20:51:05 +08:00
afc163
b3df890f57 Merge branch 'master' of github.com:ant-design/ant-design 2015-07-09 20:29:36 +08:00
afc163
567280b0dc Merge branch 'master' into components-table 2015-07-09 20:14:02 +08:00
afc163
af2ee389e4 update select color 2015-07-09 20:13:48 +08:00
yiminghe
28a1720ec9 Merge branch 'master' of github.com:ant-design/ant-design 2015-07-09 20:07:10 +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
fc85fa836b use ie8 safe react-router 2015-07-09 17:47:21 +08:00
afc163
f47b29817a import component rc-table 2015-07-09 14:51:48 +08:00
simaQ
e36aafb766 update input-group style 2015-07-09 13:48:24 +08:00
afc163
1faaad66ea Merge branch 'master' of github.com:ant-design/ant-design 2015-07-09 11:04:58 +08:00
afc163
68528f1f09 fix easing variable 2015-07-09 11:04:45 +08:00
afc163
b407c5e924 fix button variable 2015-07-09 10:56:28 +08:00
simaQ
688924707b update input-group styl 2015-07-09 10:55:06 +08:00
yiminghe
46b0685364 upgrade select 2015-07-08 22:07:15 +08:00
simaQ
3710ac73e3 remove .pd-rg .pd-lf 2015-07-08 20:15:02 +08:00
simaQ
90ebbb30bc update input-group style 2015-07-08 20:12:49 +08:00
simaQ
4ac8b03183 Merge branch 'master' of https://github.com/ant-design/ant-design 2015-07-08 20:11:06 +08:00
yiminghe
c85e10083d add switch 2015-07-08 19:47:45 +08:00
simaQ
aaa8bf43c0 Merge branch 'master' of https://github.com/ant-design/ant-design 2015-07-08 19:41:49 +08:00
羽航
74b4cad22f 进一步调整样式 2015-07-08 16:36:08 +08:00
simaQ
6012b560a7 update button-group 2015-07-08 16:21:04 +08:00
羽航
943fbd3d34 调整steps的样式 2015-07-08 15:53:51 +08:00
afc163
d02278c5a9 update color 2015-07-08 15:31:14 +08:00
afc163
d35988d7b1 统一主色调 2015-07-08 15:18:28 +08:00
afc163
ea05974dc6 datepicker style update 2015-07-08 14:55:05 +08:00
simaQ
1b64113ba3 update form 2015-07-08 13:17:14 +08:00
simaQ
7fc69b7dd6 fix the input[type=file] style 2015-07-08 12:02:57 +08:00
afc163
683fa4a8af update datepicker style 2015-07-08 11:42:22 +08:00
afc163
ed692fa383 icon position in datepicker 2015-07-08 11:05:47 +08:00
simaQ
335bffd947 modify ant-input-group's font-size when it in form 2015-07-08 00:00:19 +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
517d92ab2c fix inputnumber style 2015-07-07 17:30:24 +08:00
yiminghe
04d97f9ad7 add autoprefixer 2015-07-07 17:09:04 +08:00
afc163
2e68156621 update datepicker input style 2015-07-07 16:18:14 +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
89718e2335 ie support 2015-07-07 11:26:52 +08:00
afc163
7238531b6d update color 2015-07-06 16:21:27 +08:00
afc163
85f7fea3dd color hex style 2015-07-06 15:12:19 +08:00
afc163
c5a367febe use tint over fadeout 2015-07-06 11:20:30 +08:00
afc163
f6219f21eb primary color 2015-07-06 10:36:58 +08:00
simaQ
c4cd3ce495 add form page 2015-07-06 09:04:39 +08:00
simaQ
f4db8fe4d9 add form styles 2015-07-06 09:04:39 +08:00
afc163
c42ca53d91 breadcrumb 2015-07-02 18:33:37 +08:00
afc163
86e5a523ac breadcrumb & router 2015-07-02 17:22:26 +08:00
afc163
ced4dcb991 update breadcrumb demo 2015-07-01 21:24:04 +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
465c8c2cdf add input-number 2015-07-01 14:48:47 +08:00
yiminghe
e76e720dec update modal style 2015-06-26 15:29:44 +08:00
羽航
1bad0062f9 support ant-design prefix class and prefixCls property 2015-06-26 10:43:01 +08:00
羽航
39e2d9a3d2 add demos 2015-06-25 18:12:42 +08:00
羽航
1b4815608c fix conflict 2015-06-25 16:02:48 +08:00
羽航
e8ec073adc add steps 2015-06-25 16:01:04 +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
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
380f4e9b47 adjust mini tabs style 2015-06-19 17:31:37 +08:00
afc163
b0bbbdd245 add tab mini size demo 2015-06-19 17:26:34 +08:00
afc163
798bcba584 fix progress style in safari 2015-06-19 16:54:32 +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
74c30f4128 update modal style 2015-06-18 15:46:59 +08:00
afc163
8ab58d6fce update rc-select and demos 2015-06-18 11:57:31 +08:00
夏奈
a42cc02d4a 文字样式 2015-06-18 10:34:55 +08:00
afc163
0d2f5e3bb1 improve today style 2015-06-17 21:36:35 +08:00
afc163
5a14501bcd update datepicker style 2015-06-17 21:20:43 +08:00
afc163
8100539f8d prefix className for popover 2015-06-17 20:15:09 +08:00
afc163
64036bebf1 fix dropdown style 2015-06-17 20:09:47 +08:00
afc163
1cafea0e61 update picker input cursor 2015-06-17 18:04:42 +08:00
afc163
61686e4310 dropdown menu link color fixed 2015-06-17 17:36:29 +08:00
afc163
92fe84919b dropdown trigger arrow should rotate 2015-06-17 17:30:25 +08:00
afc163
7eaf96413e Add popover component 2015-06-17 16:58:13 +08:00
afc163
5ac56461a1 update select combobox demo 2015-06-16 19:59:07 +08:00
afc163
48700296b8 update select demos 2015-06-16 14:54:31 +08:00
yiminghe
73d89f46af update motion 2015-06-15 21:18:08 +08:00
yiminghe
1683451aec Merge branch 'master' of github.com:ant-design/ant-design 2015-06-15 20:37:10 +08:00
yiminghe
8487d5ad6d update dropdown style 2015-06-15 20:36:49 +08:00
afc163
06b085a3da fix tab link color 2015-06-15 20:34:54 +08:00
afc163
e9e2044cec Merge branch 'master' of github.com:ant-design/ant-design 2015-06-15 20:04:56 +08:00
afc163
d868a30661 prefixClassName ant-tab -> ant-tabs 2015-06-15 20:04:32 +08:00
yiminghe
97d8859ff8 update dialog style 2015-06-15 20:04:14 +08:00
然则
5a388216c8 up select style 2015-06-15 19:36:16 +08:00
然则
a6dc26bea8 up style 2015-06-15 19:29:32 +08:00
afc163
47c0b750f5 adjust select demo 2015-06-15 17:59:46 +08:00
afc163
16afacea79 adjust select demo 2015-06-15 17:54:34 +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
78748bb8ed update date hover color 2015-06-15 17:11:48 +08:00
afc163
aeb9cc7f51 update date hover color 2015-06-15 17:09:10 +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
夏奈
15027544ef Merge remote-tracking branch 'origin/master' 2015-06-15 16:27:01 +08:00
afc163
bc9ef26383 fix active tab color 2015-06-15 16:22:58 +08:00
afc163
7d45ed3a6b fix active tab font-weight 2015-06-15 16:21:57 +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
987e212613 Add today background-color 2015-06-15 15:52:57 +08:00
afc163
dda240d09b add transition for select 2015-06-15 11:01:15 +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
977f94305d fix cursor in active tab 2015-06-14 17:37:17 +08:00
偏右
900bdb4f17 Merge pull request #21 from ibigbug/off-bye-one-px
修复 1 像素误差
2015-06-14 17:34:36 +08:00
afc163
5e61c60661 update selet demo 2015-06-14 17:26:31 +08:00
Yuwei Ba
ba710b14b1 修复 1 像素误差 2015-06-14 16:49:27 +08:00
afc163
e04a9519c6 select font size 2015-06-14 15:52:47 +08:00
afc163
beacfa2dd6 update tab style 2015-06-14 14:17:10 +08:00
afc163
652df34f47 fix link color in time panel 2015-06-14 13:20:59 +08:00
偏右
34e1c66418 Merge pull request #20 from ibigbug/tab-style
Tab style
2015-06-14 13:13:39 +08:00
Yuwei Ba
3a4817b236 添加更多 Demo 2015-06-12 20:21:13 +08:00
afc163
646c6853d6 move confirm into modal 2015-06-12 19:41:30 +08:00
afc163
2decda160c improve input focus style 2015-06-12 18:37:03 +08:00
afc163
c6fd3756e3 update datepicker style 2015-06-12 15:49:06 +08:00
afc163
7a9e066946 update datepicker style 2015-06-12 15:39:01 +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
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
18f1c14988 update datepicker style 2015-06-10 20:25:19 +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
e6a0dbbcba update datepicker picker style 2015-06-10 16:22:59 +08:00
afc163
b6c1ace624 update tooltip style 2015-06-10 13:47:56 +08:00
偏右
4a56a4758c Merge pull request #13 from ibigbug/tabs-basic
Tabs basic
2015-06-09 22:07:01 +08:00
然则
34e0fa4b8d add select component 2015-06-09 21:16:59 +08:00
Yuwei Ba
6dc6057ff9 删除公共部分样式 2015-06-09 19:36:17 +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
afc163
73e1b08de9 fix variable in tooltip 2015-06-09 17:58:28 +08:00
afc163
5eda4608f7 remove font-family in calendar style 2015-06-09 17:54:19 +08:00
yiminghe
38a6eaecf6 fix tooltip 2015-06-09 17:44:22 +08:00
afc163
e156d76940 update tooltip style 2015-06-09 16:40:16 +08:00
afc163
1de932c085 move ant-style inside ant-desgin 2015-06-09 15:21:44 +08:00