diff --git a/components/datepicker/index.md b/components/datepicker/index.md
index 36bf5589a9..afa0e26365 100644
--- a/components/datepicker/index.md
+++ b/components/datepicker/index.md
@@ -28,7 +28,7 @@
 | disabled     | 禁用           | bool     | false        |
 
 <style>
-.code-box-demo .ant-calendar-picker {
+.code-box-demo .ant-calendar-picker-input {
   width: 200px;
 }
 </style>
diff --git a/components/input-number/index.md b/components/input-number/index.md
index 774a06522c..ad2603628c 100644
--- a/components/input-number/index.md
+++ b/components/input-number/index.md
@@ -10,7 +10,7 @@
 
 ## 何时使用
 
-- 当需要获取标准数值时。
+当需要获取标准数值时。
 
 ## API
 
diff --git a/style/components/datepicker/Picker.less b/style/components/datepicker/Picker.less
index 471d9305f5..4d64aaa56e 100644
--- a/style/components/datepicker/Picker.less
+++ b/style/components/datepicker/Picker.less
@@ -10,7 +10,6 @@
 .@{prefixCalendarClass}-picker {
   position: relative;
   display: inline-block;
-  width: 100%;
 
   &-icon {
     position: absolute;
diff --git a/style/components/form.less b/style/components/form.less
index fa00ed41dd..d4551b161a 100644
--- a/style/components/form.less
+++ b/style/components/form.less
@@ -85,13 +85,17 @@ input[type="checkbox"] {
 }
 
 .@{css-prefix}form-text, .@{css-prefix}form-split {
-  display: inline-block;
   margin: 0!important;
   padding-top: 7px;
   padding-bottom: 7px;
 }
 
+.@{css-prefix}form-text {
+  display: inline-block;
+}
+
 .@{css-prefix}form-split {
+  display: block;
   text-align: center;
 }
 
@@ -159,6 +163,10 @@ form {
     margin-top: -1px;
     margin-right: 8px;
   }
+
+  .@{prefixCalendarClass}-picker {
+    width: 100%;
+  }
 }
 
 // Form layout
diff --git a/style/components/inputNumber.less b/style/components/inputNumber.less
index 18fc79fdda..3460a0e813 100644
--- a/style/components/inputNumber.less
+++ b/style/components/inputNumber.less
@@ -22,7 +22,8 @@
     height: 14px;
     overflow: hidden;
     color: #999;
-    &:hover {
+    &:hover &-up-inner, 
+    &:hover &-down-inner {
       color: tint(@primary-color, 20%);
     }
   }
@@ -37,6 +38,7 @@
     height: 12px;
     .iconfont-size-under-12px(8px);
     right: 4px;
+    color: #999;
   }
 
   &:hover {