From 657c707a7906986e0ba443ae11fc04e27bc83e5c Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Thu, 5 Jan 2017 16:57:41 +0800
Subject: [PATCH] Hide useless prop Form[horizontal]

---
 components/form/demo/advanced-search.md       |  3 +--
 components/form/demo/dynamic-form-item.md     |  2 +-
 components/form/demo/register.md              |  2 +-
 components/form/demo/time-related-controls.md |  2 +-
 components/form/demo/validate-static.md       |  2 +-
 components/form/demo/without-form-create.md   |  2 +-
 components/form/index.en-US.md                |  5 ++--
 components/form/index.zh-CN.md                |  5 ++--
 components/form/style/index.less              | 23 -------------------
 9 files changed, 10 insertions(+), 36 deletions(-)

diff --git a/components/form/demo/advanced-search.md b/components/form/demo/advanced-search.md
index b6aeb0e172..ff1250021f 100644
--- a/components/form/demo/advanced-search.md
+++ b/components/form/demo/advanced-search.md
@@ -68,7 +68,6 @@ class AdvancedSearchForm extends React.Component {
     const shownCount = expand ? children.length : 6;
     return (
       <Form
-        horizontal
         className="ant-advanced-search-form"
         onSubmit={this.handleSearch}
       >
@@ -111,7 +110,7 @@ ReactDOM.render(
 ````
 
 <style>
-#components-form-demo-advanced-search .ant-form-horizontal {
+#components-form-demo-advanced-search .ant-form {
   max-width: none;
 }
 #components-form-demo-advanced-search .search-result-list {
diff --git a/components/form/demo/dynamic-form-item.md b/components/form/demo/dynamic-form-item.md
index a1304e84fb..1612aa3436 100644
--- a/components/form/demo/dynamic-form-item.md
+++ b/components/form/demo/dynamic-form-item.md
@@ -101,7 +101,7 @@ class DynamicFieldSet extends React.Component {
       );
     });
     return (
-      <Form onSubmit={this.handleSubmit} horizontal>
+      <Form onSubmit={this.handleSubmit}>
         {formItems}
         <FormItem {...formItemLayoutWithOutLabel}>
           <Button type="dashed" onClick={this.add} style={{ width: '60%' }}>
diff --git a/components/form/demo/register.md b/components/form/demo/register.md
index 117e8791e0..973c7ff1b4 100644
--- a/components/form/demo/register.md
+++ b/components/form/demo/register.md
@@ -95,7 +95,7 @@ const RegistrationForm = Form.create()(React.createClass({
       </Select>
     );
     return (
-      <Form horizontal onSubmit={this.handleSubmit}>
+      <Form onSubmit={this.handleSubmit}>
         <FormItem
           {...formItemLayout}
           label="E-mail"
diff --git a/components/form/demo/time-related-controls.md b/components/form/demo/time-related-controls.md
index a25cbd48dc..0eb6b3f807 100644
--- a/components/form/demo/time-related-controls.md
+++ b/components/form/demo/time-related-controls.md
@@ -59,7 +59,7 @@ const TimeRelatedForm = Form.create()(React.createClass({
       rules: [{ type: 'array', required: true, message: 'Please select time!' }],
     };
     return (
-      <Form horizontal onSubmit={this.handleSubmit}>
+      <Form onSubmit={this.handleSubmit}>
         <FormItem
           {...formItemLayout}
           label="DatePicker"
diff --git a/components/form/demo/validate-static.md b/components/form/demo/validate-static.md
index f92ee8088a..540af4cb77 100644
--- a/components/form/demo/validate-static.md
+++ b/components/form/demo/validate-static.md
@@ -30,7 +30,7 @@ import { Form, Input, DatePicker, Col } from 'antd';
 const FormItem = Form.Item;
 
 ReactDOM.render(
-  <Form horizontal>
+  <Form>
     <FormItem
       label="Fail"
       labelCol={{ span: 5 }}
diff --git a/components/form/demo/without-form-create.md b/components/form/demo/without-form-create.md
index fa74d6df17..08fc7a0ec3 100644
--- a/components/form/demo/without-form-create.md
+++ b/components/form/demo/without-form-create.md
@@ -54,7 +54,7 @@ class RawForm extends React.Component {
     const number = this.state.number;
     const tips = 'A prime is a natural number greater than 1 that has no positive divisors other than 1 and itself.';
     return (
-      <Form horizontal>
+      <Form>
         <FormItem
           {...formItemLayout}
           label="Prime between 8 & 12"
diff --git a/components/form/index.en-US.md b/components/form/index.en-US.md
index e34c576507..300b3c74c4 100644
--- a/components/form/index.en-US.md
+++ b/components/form/index.en-US.md
@@ -11,7 +11,7 @@ Form is used to collect, validate, and submit the user input, usually contains v
 
 You can align the controls of a `form` using one of the following attributes：
 
-- `horizontal`：to horizontally align the `label`s and controls of the fields.
+- `horizontal`：to horizontally align the `label`s and controls of the fields. (Default)
 - `vertical`：to vertically align the `label`s and controls of the fields.
 - `inline`：to render form fields in one line.
 
@@ -38,7 +38,6 @@ A form field is defined using `<Form.Item />`.
 |-----------|------------------------------------------|------------|---------|
 | form | Decorated by `Form.create()` will be automatically set `this.props.form` property, so just pass to form, you don't need to set it by yourself after 1.7.0. | object | n/a
 | vertical | Use vertical layout. | boolean | false |
-| horizontal | Use horizontal layout. | boolean  | false    |
 | inline | Use inline alignment. | boolean | false |
 | onSubmit | Defines a function will be called if form data validation is successful. | Function(e:Event) |  |
 
@@ -118,7 +117,7 @@ Note:
 | hasFeedback | Used with `validateStatus`, this option specifies the validation status icon. Recommended to be used only with `Input`. | boolean | false |
 
 <style>
-.code-box-demo .ant-form-horizontal {
+.code-box-demo .ant-form:not(.ant-form-inline):not(.ant-form-vertical) {
   max-width: 540px;
 }
 </style>
diff --git a/components/form/index.zh-CN.md b/components/form/index.zh-CN.md
index 81ec3116ad..5719471347 100644
--- a/components/form/index.zh-CN.md
+++ b/components/form/index.zh-CN.md
@@ -12,7 +12,7 @@ title: Form
 
 我们为 `form` 提供了以下两种排列方式：
 
-- 水平排列：标签和表单控件水平排列；
+- 水平排列：标签和表单控件水平排列；（默认）
 - 水质排列：标签和表单控件上下垂直排列；
 - 行内排列：表单项水平行内排列。
 
@@ -40,7 +40,6 @@ title: Form
 |-----------|------------------------------------------|------------|-------|
 | form | 经 `Form.create()` 包装过的组件会自带 `this.props.form` 属性，直接传给 Form 即可。1.7.0 之后无需设置 | object | 无 |
 | vertical | 垂直排列布局 | boolean | false |
-| horizontal | 水平排列布局 | boolean  | false    |
 | inline | 行内排列布局 | boolean | false |
 | onSubmit | 数据验证成功后回调事件 | Function(e:Event) |  |
 
@@ -119,7 +118,7 @@ CustomizedForm = Form.create({})(CustomizedForm);
 | hasFeedback | 配合 validateStatus 属性使用，展示校验状态图标，建议只配合 Input 组件使用 | boolean | false  |
 
 <style>
-.code-box-demo .ant-form-horizontal {
+.code-box-demo .ant-form:not(.ant-form-inline):not(.ant-form-vertical) {
   max-width: 540px;
 }
 </style>
diff --git a/components/form/style/index.less b/components/form/style/index.less
index 3c625a0198..f129995869 100644
--- a/components/form/style/index.less
+++ b/components/form/style/index.less
@@ -235,19 +235,6 @@ form {
   }
 }
 
-// Form layout
-//== Horizontal Form
-.@{form-prefix-cls}-horizontal {
-  .@{form-prefix-cls}-item {
-    .make-row;
-  }
-
-  .@{ant-prefix}-radio-inline,
-  .@{ant-prefix}-checkbox-inline {
-    vertical-align: baseline;
-  }
-}
-
 // Form layout
 //== Vertical Form
 .@{form-prefix-cls}-vertical {
@@ -293,16 +280,6 @@ form {
   }
 }
 
-.@{form-prefix-cls}-horizontal,
-.@{form-prefix-cls}-inline {
-  label {
-    > input[type="radio"],
-    > input[type="checkbox"] {
-      margin-right: 4px;
-    }
-  }
-}
-
 // Validation state
 .has-success,
 .has-warning,