Commit Graph

987 Commits

Author SHA1 Message Date
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