Commit Graph

411 Commits

Author SHA1 Message Date
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
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
5e9c3b9ba6 inline-block 会导致容器内容的偏移.. 2015-07-13 17:21:56 +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
罗宪
7d0b668801 update motion add ease 2015-07-13 15:48:24 +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
偏右
754c234a0b Update motion.less 2015-07-12 22:01:05 +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
simaQ
1164ba22a7 update iconfont 2015-07-10 17:17:58 +08:00
Benjy Cui
c83160e2e3 Merge branch 'master' of github.com:benjycui/ant-design 2015-07-10 16:22:56 +08:00
Benjy Cui
83b5e34039 Update iconfont and relative code. 2015-07-10 16:16:32 +08:00
afc163
8c78bb6bbc Merge branch 'master' of github.com:ant-design/ant-design 2015-07-10 14:56:28 +08:00
罗宪
879573d4c4 update motion ease and timer 2015-07-10 14:30:17 +08:00
罗宪
716dda944b update motion ease and timer 2015-07-10 14:27:12 +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
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
2c46ad34d3 update iconfont 2015-07-09 19:50:47 +08:00
afc163
68b9e6125b update iconfont 2015-07-09 18:24:41 +08:00
yiminghe
436ae486a1 Merge branch 'master' of github.com:ant-design/ant-design 2015-07-09 17:47:40 +08:00
yiminghe
fc85fa836b use ie8 safe react-router 2015-07-09 17:47:21 +08:00
simaQ
3086068618 add input status mixins 2015-07-09 17:19:01 +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
afc163
2bd8ede57c Merge branch 'master' of github.com:ant-design/ant-design 2015-07-09 00:29:55 +08:00
afc163
b95f1b8310 update button bg color 2015-07-09 00:29:39 +08:00
yiminghe
46b0685364 upgrade select 2015-07-08 22:07:15 +08:00
yiminghe
3c9b82a8bf Merge branch 'master' of github.com:ant-design/ant-design 2015-07-08 20:28:24 +08:00
yiminghe
ce854b0e39 fix zoom motion 2015-07-08 20:28:06 +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
羽航
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
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
afc163
21cca75396 Merge branch 'master' of github.com:ant-design/ant-design 2015-07-08 13:58:00 +08:00
afc163
e1b43c2423 update font family 2015-07-08 13:57:54 +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
simaQ
9f5cf9e842 update fieldset style 2015-07-07 23:44:52 +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