diff --git a/components/form/demo/validate.md b/components/form/demo/validate.md
index 9e468ba04..26d760a7a 100644
--- a/components/form/demo/validate.md
+++ b/components/form/demo/validate.md
@@ -1,6 +1,6 @@
# 校验提示
-- order: 5
+- order: 4
我们为表单控件的校验状态定义了样式,共有三种校验状态类:
@@ -15,23 +15,23 @@
---
````html
-
校验提示
+
不带反馈图标的校验提示
-
-
-
-
-
-
-
-
-
-
-
+
带图标的校验提示(水平排列的表单)
diff --git a/components/form/index.md b/components/form/index.md
index 8ce364812..8269fa8be 100644
--- a/components/form/index.md
+++ b/components/form/index.md
@@ -11,7 +11,7 @@
### 表单
-除了默认的排列方式,我们还为 `form` 提供了以下两种排列方式:
+我们为 `form` 提供了以下两种排列方式:
- 水平排列:`.ant-form-horizontal` 类可以实现 `label` 标签和表单控件的水平排列;
- 行内排列:`.ant-form-inline` 类可使其表现为 inline-block 级别的控件。
diff --git a/style/components/form.less b/style/components/form.less
index 911c1b215..4957d1417 100644
--- a/style/components/form.less
+++ b/style/components/form.less
@@ -52,7 +52,7 @@ label {
form {
.@{css-prefix}input {
height: @input-height-lg;
- font-size: 12px;
+ font-size: @font-size-base;
padding: @input-padding-horizontal;
}
.has-feedback {
@@ -65,7 +65,9 @@ form {
.@{css-prefix}input-group > .@{css-prefix}input,
.@{css-prefix}input-group > .@{css-prefix}input-group-addon,
.@{css-prefix}input-group > .@{css-prefix}input-group-btn > .input-btn {
- .input-lg();
+ height: @input-height-lg;
+ font-size: @font-size-base;
+ padding: @input-padding-horizontal;
}
// input[type=file]
diff --git a/style/mixins/form.less b/style/mixins/form.less
index 1d32480ae..1c1ba1bee 100644
--- a/style/mixins/form.less
+++ b/style/mixins/form.less
@@ -41,7 +41,7 @@
width: 100%;
padding: 0;
margin-bottom: 20px;
- font-size: (@font-size-base * 1.5);
+ font-size: 14px;
line-height: inherit;
color: @legend-color;
border: 0;
diff --git a/style/themes/default/custom.less b/style/themes/default/custom.less
index 1cc0a5056..1d5654098 100644
--- a/style/themes/default/custom.less
+++ b/style/themes/default/custom.less
@@ -107,8 +107,8 @@
// Form
// --------------------------------
// Legend
-@legend-color : #222;
-@legend-border-color : #e5e5e5;
+@legend-color : #999;
+@legend-border-color : #d9d9d9;
// Label
@label-required-color : #F60;
@label-color: #999;