diff --git a/components/datepicker/index.md b/components/datepicker/index.md
index afa0e26365..36bf5589a9 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-input {
+.code-box-demo .ant-calendar-picker {
   width: 200px;
 }
 </style>
diff --git a/components/form/demo/inputs.md b/components/form/demo/inputs.md
index 9f39ca5d42..261e99f556 100644
--- a/components/form/demo/inputs.md
+++ b/components/form/demo/inputs.md
@@ -30,17 +30,6 @@
       </div>
     </div>
   </div>
-  <div class="ant-form-item">
-    <label class="col-6" for="site5">带按钮的输入框：</label>
-    <div class="col-16">
-      <div class="ant-input-group">
-        <input type="text" class="ant-input" id="site5" placeholder="Search for..." />
-        <div class="ant-input-group-btn">
-          <button class="ant-btn" type="button">GO!</button>
-        </div>
-      </div>
-    </div>
-  </div>
   <div class="ant-form-item">
     <label class="col-6">输入身份证：</label>
     <div class="col-16">
diff --git a/style/components/datepicker/Picker.less b/style/components/datepicker/Picker.less
index 4d64aaa56e..471d9305f5 100644
--- a/style/components/datepicker/Picker.less
+++ b/style/components/datepicker/Picker.less
@@ -10,6 +10,7 @@
 .@{prefixCalendarClass}-picker {
   position: relative;
   display: inline-block;
+  width: 100%;
 
   &-icon {
     position: absolute;
diff --git a/style/mixins/form.less b/style/mixins/form.less
index 26b2d1c0d3..bf9ffddade 100644
--- a/style/mixins/form.less
+++ b/style/mixins/form.less
@@ -14,6 +14,10 @@
     }
   }
 
+  .@{prefixCalendarClass}-picker-open .@{prefixCalendarClass}-picker-input {
+    box-shadow: 0 0 0 2px tint(@border-color, 80%);
+  }
+
   .@{css-prefix}input-group-addon {
     color: @text-color;
     border-color: @border-color;