diff --git a/components/dropdown/index.md b/components/dropdown/index.md
index 13db8872b8..933a5d36c8 100644
--- a/components/dropdown/index.md
+++ b/components/dropdown/index.md
@@ -20,7 +20,7 @@
|-------------|------------------|--------------------|--------------|
| trigger | 触发下拉的行为 | ['click'] or ['hover'] | ['hover'] |
| overlay | 菜单节点 | [Menu](/components/menu) | 无 |
-
+| getPopupContainer | 菜单渲染父节点。默认渲染到 body 上,如果你遇到菜单滚动定位问题,试试修改为滚动的区域,并相对其定位。[示例](http://codepen.io/anon/pen/ONjyba?editors=001) | Function(triggerNode) | () => document.body |
菜单可由 `antd.Menu` 取得,可设置 `onSelect` 回调,菜单还包括菜单项 `antd.Menu.Item`,分割线 `antd.Menu.Divider`。
diff --git a/components/form/Form.jsx b/components/form/Form.jsx
index b282928d9b..3825fb22e7 100644
--- a/components/form/Form.jsx
+++ b/components/form/Form.jsx
@@ -29,15 +29,15 @@ export default class Form extends React.Component {
}
render() {
- const { prefixCls, className } = this.props;
+ const { prefixCls, className, style } = this.props;
const formClassName = classNames({
- [className]: !!className,
[`${prefixCls}-horizontal`]: this.props.horizontal,
[`${prefixCls}-inline`]: this.props.inline,
+ [className]: !!className,
});
return (
-
+
{children}
);
diff --git a/components/input-number/index.jsx b/components/input-number/index.jsx
index 753bbfa5f9..8eb6010951 100644
--- a/components/input-number/index.jsx
+++ b/components/input-number/index.jsx
@@ -11,8 +11,8 @@ export default class InputNumber extends React.Component {
render() {
const { className, size, ...other } = this.props;
const inputNumberClass = classNames({
- 'ant-input-number-lg': size === 'large',
- 'ant-input-number-sm': size === 'small',
+ [`${this.props.prefixCls}-lg`]: size === 'large',
+ [`${this.props.prefixCls}-sm`]: size === 'small',
[className]: !!className,
});
diff --git a/components/popover/index.md b/components/popover/index.md
index c64b6532ad..def27a85f5 100644
--- a/components/popover/index.md
+++ b/components/popover/index.md
@@ -26,3 +26,4 @@
| prefixCls | 浮层的类名 | string | ant-popover |
| visible | 用于手动控制浮层显隐 | boolean | false |
| onVisibleChange | 显示隐藏改变的回调 | function | 无 |
+| getTooltipContainer | 菜单渲染父节点。默认渲染到 body 上,如果你遇到菜单滚动定位问题,试试修改为滚动的区域,并相对其定位。[示例](http://codepen.io/anon/pen/ONjyba?editors=001) | Function(triggerNode) | () => document.body |
diff --git a/components/queue-anim/demo/form.md b/components/queue-anim/demo/form.md
index 2b82e8210a..c44e3e2092 100644
--- a/components/queue-anim/demo/form.md
+++ b/components/queue-anim/demo/form.md
@@ -7,7 +7,8 @@
---
````jsx
-import { QueueAnim, Button, Checkbox, Radio } from 'antd';
+import { QueueAnim, Button, Radio, Input, Form, Row, Col } from 'antd';
+const FormItem = Form.Item;
const RadioGroup = Radio.Group;
const Test = React.createClass({
@@ -22,54 +23,37 @@ const Test = React.createClass({
});
},
render() {
+ const formItemLayout = {
+ labelCol: { span: 6 },
+ wrapperCol: { span: 14 },
+ };
return (
-
+
{this.state.show ? [
- ,
- ,
-
-
-
-
- 男的
- 女的
-
-
-
,
- ,
- ,
-
+
+ 大眼萌 minion
+ ,
+
+
+ ,
+
+
+ 男的
+ 女的
+
+ ,
+
+
+ ,
+
+
+
+
+
,
] : null}
diff --git a/components/queue-anim/demo/simple.md b/components/queue-anim/demo/simple.md
index c278890fee..57c74c2475 100644
--- a/components/queue-anim/demo/simple.md
+++ b/components/queue-anim/demo/simple.md
@@ -10,7 +10,7 @@
import { QueueAnim } from 'antd';
ReactDOM.render(
-
+
依次进场
依次进场
依次进场
diff --git a/components/select/index.md b/components/select/index.md
index a8ab3278e2..86b0f3e724 100644
--- a/components/select/index.md
+++ b/components/select/index.md
@@ -43,6 +43,7 @@
| size | 选择框大小,可选 `large` `small` | String | default |
| showSearch | 在下拉中显示搜索框 | boolean | false |
| disabled | 是否禁用 | boolean | false |
+| getPopupContainer | 菜单渲染父节点。默认渲染到 body 上,如果你遇到菜单滚动定位问题,试试修改为滚动的区域,并相对其定位。[示例](http://codepen.io/anon/pen/ONjyba?editors=001) | Function(triggerNode) | () => document.body |
### Option props
diff --git a/style/mixins/button.less b/style/mixins/button.less
index cc9b90c035..e6b0237d9a 100644
--- a/style/mixins/button.less
+++ b/style/mixins/button.less
@@ -84,9 +84,6 @@
.user-select(none);
.transition(all .3s @ease-in-out);
transform: translate3d(0, 0, 0);
- // Fix for ie8 border-radius
- // http://css3pie.com/documentation/known-issues/#z-index
- position: relative\0;
> .@{iconfont-css-prefix} {
line-height: 1;