Commit Graph

911 Commits

Author SHA1 Message Date
夏奈
e0dfb9d51e confilct 2015-06-15 16:26:44 +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
520d6b60da site style 2015-06-15 16:00:45 +08:00
afc163
987e212613 Add today background-color 2015-06-15 15:52:57 +08:00
afc163
6340b875b5 update watch config 2015-06-15 15:52:31 +08:00
afc163
f5835eec78 update element tagName 2015-06-15 15:11:02 +08:00
afc163
39bf1d09e7 update progress demo 2015-06-15 14:43:27 +08:00
afc163
61b7297ce4 update progress demo 2015-06-15 14:07:20 +08:00
afc163
e1f9c1e11c Merge branch 'master' of github.com:ant-design/ant-design 2015-06-15 12:11:13 +08:00
afc163
8d74b7e0e8 anticon should not have default font-size 2015-06-15 12:10:57 +08:00
夏奈
9b5c224234 m 2015-06-15 11:58:46 +08:00
夏奈
a100bc0de3 m 2015-06-15 11:55:54 +08:00
夏奈
2c58d5e1ce mini demo 2015-06-15 11:48:30 +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
9b4fe2b8c1 update logo 2015-06-14 18:36:02 +08:00
afc163
33ff631ef0 update ant design icon 2015-06-14 18:32:09 +08:00
afc163
242f16f39d update README.md 2015-06-14 18:29:20 +08:00
afc163
975633ed1a update README.md 2015-06-14 18:28:08 +08:00
afc163
737ef1167d Add info for components 2015-06-14 17:54:08 +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
afc163
10ff912e86 remove sketch link 2015-06-14 17:17:09 +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
夏奈
c467790b15 progress demo 2015-06-14 14:01:10 +08:00
夏奈
d2702bf92e Merge branch 'master' of github.com:ant-design/ant-design 2015-06-14 13:28:36 +08:00
afc163
81ee5588bc tweak code style 2015-06-14 13:21:29 +08:00
afc163
652df34f47 fix link color in time panel 2015-06-14 13:20:59 +08:00
afc163
22c48941e9 tweak code style 2015-06-14 13:20:35 +08:00
偏右
34e1c66418 Merge pull request #20 from ibigbug/tab-style
Tab style
2015-06-14 13:13:39 +08:00
夏奈
3e2026efca progress demo 2015-06-14 12:55:44 +08:00
yiminghe
580481221f adjust onCancel 2015-06-12 23:46:04 +08:00
yiminghe
d5f760f9e7 remove ref 2015-06-12 23:31:44 +08:00
Yuwei Ba
3a4817b236 添加更多 Demo 2015-06-12 20:21:13 +08:00
Yuwei Ba
b870935c91 Tabs -> Tab 2015-06-12 20:03:38 +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