Commit Graph

281 Commits

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