Commit Graph

8677 Commits

Author SHA1 Message Date
afc163
9ef7b23b53 Merge branch 'master' into feature-2.10 2017-04-13 11:18:49 +08:00
afc163
fc199e47b8 fix snap 2017-04-13 11:18:31 +08:00
afc163
b8888cfb04 Merge branch 'master' into feature-2.10 2017-04-13 11:12:41 +08:00
afc163
c7261f5fb6 update locale-provider test case 2017-04-13 11:12:30 +08:00
afc163
31273135e2 remove displayName 2017-04-13 11:10:40 +08:00
afc163
1caba286c4 fix test case 2017-04-13 11:09:13 +08:00
偏右
c1c261e081 Merge pull request #5643 from handycode/patch-1
fix: Icon add displayName
2017-04-13 11:05:36 +08:00
偏右
fe57289656 Merge pull request #5699 from kirbo/feature-2.10
Add locale fi_FI (#5674)
2017-04-13 11:03:13 +08:00
afc163
5be7dc6b90 Fix InputGroup style, close #5743 2017-04-13 10:56:19 +08:00
afc163
91d67f732c Add back react-addons-test-utils 2017-04-12 21:23:54 +08:00
afc163
031aa14090 Add Hotjar Tracking Code 2017-04-12 21:17:04 +08:00
afc163
c5ab604f70 update introduce.md 2017-04-12 20:56:47 +08:00
afc163
a8808c45ac react-addons-test-utils => react-dom/test-utils 2017-04-12 20:49:02 +08:00
afc163
bdf0f6212b fix design doc 2017-04-12 20:45:07 +08:00
afc163
1be0936cb8 fix snapshots 2017-04-12 20:44:57 +08:00
afc163
04af6d5c7f improve table demo style, close #5697 2017-04-12 20:31:31 +08:00
afc163
07e9f01aef upgrade rc-collapse, #5678 2017-04-12 20:14:56 +08:00
afc163
dd72822c6b remove compositor.json 2017-04-12 18:32:05 +08:00
偏右
c579a25cb5 Update compositor.json via compositor.io 2017-04-12 18:31:04 +08:00
偏右
cf7b56751a Update compositor.json 2017-04-12 18:31:01 +08:00
偏右
08ffa60cce Update compositor.json 2017-04-12 18:30:28 +08:00
偏右
fd228f5b15 Merge pull request #5732 from ko/patch-1
Minor spelling and grammar changes.
2017-04-12 15:56:11 +08:00
ko
5fa0652af2 Minor spelling and grammar changes. 2017-04-12 00:38:45 -07:00
afc163
1083f82c5d Fix icon transtion delay problem in Chrome 2017-04-12 15:30:35 +08:00
afc163
f2f3719748 Fix doc format 2017-04-12 14:54:52 +08:00
偏右
66d6859827 Merge pull request #5731 from pinggod/issue-5707
fix:  issue 5707 override the default a:focus style when it nested in menu component
2017-04-12 14:45:08 +08:00
pinggod
01f0e07835 fix issue 5707: override the default a:focus style when it nested in the menu component 2017-04-12 14:42:07 +08:00
afc163
4067c1830c update changelog for RangePicker placeholder, #5721 2017-04-12 10:56:01 +08:00
偏右
01b87171e2 Merge pull request #5723 from manjitkumar/master
use PropTypes from 'prop-types' mdoule instead of React
2017-04-12 10:39:59 +08:00
偏右
005c4f3c5c Merge pull request #5720 from whtang906/master
Add missing props(parser) into InputNumberProps
2017-04-12 10:39:00 +08:00
Manjit Kumar
4e055ed5d0 use PropTypes from 'prop-types' mdoule instead of React
- as React.PropTypes is being deprecated
 - Warning: Accessing PropTypes via the main React package is deprecated. Use the prop-types package from npm instead.
 - Solution: https://facebook.github.io/react/blog/2017/04/07/react-v15.5.0.html#migrating-from-react.proptypes
2017-04-12 02:22:05 +05:30
whtang906
851f8a8756 Add missing props(parser) into InputNumberProps 2017-04-11 21:16:02 +08:00
偏右
aa7419a7ec Merge pull request #5718 from leadream/patch-1
not aligned after customizing the size of input
2017-04-11 19:46:58 +08:00
leadream
193b2b7684 not aligned after customizing the size of input
For some reasons I customized the size of <Input/>. Now the default height of <Input> is 40px. But there's a problem in <RangePicker/> after doing that: the texts and icon inside it are not aligned vertically at center.

When I look into the code I found the height of `ant-calendar-range-picker-input` is 18px. I modified it to 100% and it aligned. I'm not sure if it can affect the other code.

----------------------------------------
因为某些原因我自定义了 <Input/> 的尺寸,现在它的默认高度是40px。但是当我使用 <RangePicker/> 组件时,我发现了一个问题:输入框里面的文字和图标在垂直方向不能居中对齐。我看了一下 css 代码,发现里面的 `ant-calendar-range-picker-input` 高度是固定的18px,我把它改成100%就可以垂直居中对齐了。我不知道这个改动是否会影响其他代码。
2017-04-11 18:48:03 +08:00
afc163
3ca3c178cc Add English gitter chat room 2017-04-11 18:13:58 +08:00
afc163
f311ff40ed Add English gitter chat room 2017-04-11 18:07:53 +08:00
afc163
92b8e8534e change variable names #5711 2017-04-11 17:56:38 +08:00
偏右
0745f8b231 Merge pull request #5711 from kappa-gooner/master
Adding less variables for table head background color and table row h…
2017-04-11 17:54:13 +08:00
偏右
861de2823f Merge pull request #5713 from lionkeng/master
Fix for issue #5712
2017-04-11 17:53:48 +08:00
Sanjay Kumar
692ccf85e7 Adding less variables for table head background color and table row hover 2017-04-11 17:08:09 +08:00
Wei Zhu
5ddd7f847f docs: Document customized form control
Related: #5700
2017-04-10 22:42:56 +08:00
Kimmo Saari
0d4b436eb2 Add locale fi_FI (#5674) 2017-04-10 16:52:48 +03:00
afc163
e20965e1ee update scaffold page link 2017-04-10 17:31:58 +08:00
afc163
5ed4919131 Fix tree select arrow rotate bug, close #5693 2017-04-10 16:51:12 +08:00
偏右
318258d5d8 Merge pull request #5660 from ddcat1115/fixed-Layout.Sider
add fixed sider
2017-04-10 15:56:58 +08:00
Benjy Cui
d8e465d579 css: fix height of MonthPicker 2017-04-10 15:30:24 +08:00
keng
681a160e35 If you use locale-provider, specify the ant-design theme as the default theme. This will automatically add all the less variables defined by ant-design. This is useful if you want to create custom themes with less and you are referencing less variables defined by ant-design. 2017-04-10 14:33:18 +08:00
乐仪
686cff965c undate 2017-04-10 14:02:00 +08:00
乐仪
69f7cf0c55 add fixed sider 2017-04-10 14:02:00 +08:00
偏右
191b9f3f79 Merge pull request #5687 from Syzmex/master
add `min-width`
2017-04-10 14:00:12 +08:00