From 01f6b9da7d76814a1d974556957d41e890ee6ff6 Mon Sep 17 00:00:00 2001
From: "qingwei.li" <cinwell.li@gmail.com>
Date: Tue, 23 Aug 2016 17:44:24 +0800
Subject: [PATCH] Fix DatePicker style

---
 examples/docs/input.md                        |  2 +-
 packages/date-picker/src/css/date-picker.css  |  2 +-
 .../date-picker/src/css/date-range-picker.css |  2 +-
 packages/date-picker/src/panel/date-range.vue | 27 +++++++++----------
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/examples/docs/input.md b/examples/docs/input.md
index 724f36466..5afbd0b20 100644
--- a/examples/docs/input.md
+++ b/examples/docs/input.md
@@ -70,7 +70,7 @@
 
 ## 禁用状态
 
-<div class="demo-box demo-input">  
+<div class="demo-box demo-input">
   <el-input
     :disabled="true"
     placeholder="请输入内容"
diff --git a/packages/date-picker/src/css/date-picker.css b/packages/date-picker/src/css/date-picker.css
index 0281ebb1f..49cf40449 100644
--- a/packages/date-picker/src/css/date-picker.css
+++ b/packages/date-picker/src/css/date-picker.css
@@ -35,7 +35,7 @@
     @e time-header {
       position: relative;
       border-bottom: 1px solid var(--datepicker-inner-border-color);
-      font-size: 0;
+      font-size: 12px;
       padding: 8px 5px 5px 5px;
       display: flex;
     }
diff --git a/packages/date-picker/src/css/date-range-picker.css b/packages/date-picker/src/css/date-range-picker.css
index 7c8a7c135..3bfbe62d6 100644
--- a/packages/date-picker/src/css/date-range-picker.css
+++ b/packages/date-picker/src/css/date-range-picker.css
@@ -89,7 +89,7 @@
     @e time-header {
       position: relative;
       border-bottom: 1px solid var(--datepicker-inner-border-color);
-      font-size: 0;
+      font-size: 12px;
       padding: 8px 5px 5px 5px;
       display: flex;
 
diff --git a/packages/date-picker/src/panel/date-range.vue b/packages/date-picker/src/panel/date-range.vue
index 8d6dce033..cf6715e77 100644
--- a/packages/date-picker/src/panel/date-range.vue
+++ b/packages/date-picker/src/panel/date-range.vue
@@ -115,9 +115,9 @@
         </div>
       </div>
       <div class="el-picker-panel__footer" v-if="showTime">
-        <a
+        <!-- <a
           class="el-picker-panel__link-btn"
-          @click="changeToToday">{{ $t('datepicker.today') }}</a>
+          @click="changeToToday">{{ $t('datepicker.today') }}</a> -->
         <button
           type="button"
           class="el-picker-panel__btn"
@@ -400,18 +400,15 @@
         this.rightTimePickerVisible = false;
       },
 
-      handleLeftTimePick(value) {
-        if (!this.minDate) {
-          this.minDate = new Date();
-        }
-        this.minDate.setHours(value.getHours());
-        this.minDate.setMinutes(value.getMinutes());
-        this.minDate.setSeconds(value.getSeconds());
+      handleLeftTimePick(value, visible, first) {
+        this.minDate = value || this.minDate || new Date();
 
-        this.minDate = new Date(this.minDate);
+        if (!first) {
+          this.leftTimePickerVisible = visible;
+        }
       },
 
-      handleRightTimePick(value) {
+      handleRightTimePick(value, visible, first) {
         if (!this.maxDate) {
           const now = new Date();
           if (now >= this.minDate) {
@@ -420,11 +417,11 @@
         }
 
         if (this.maxDate) {
-          this.maxDate.setHours(value.getHours());
-          this.maxDate.setMinutes(value.getMinutes());
-          this.maxDate.setSeconds(value.getSeconds());
+          this.maxDate = value;
+        }
 
-          this.maxDate = new Date(this.maxDate);
+        if (!first) {
+          this.rightTimePickerVisible = visible;
         }
       },