From 8ea9e71575b8bd9b8565126e1a595825c53da2ca Mon Sep 17 00:00:00 2001
From: "cinwell.li" <cinwell.li@gmail.com>
Date: Wed, 22 Feb 2017 15:17:22 +0800
Subject: [PATCH] Scrollbar: fix style (#2948)

---
 packages/scrollbar/src/main.js                          | 7 +++++--
 packages/theme-default/src/date-picker/time-spinner.css | 4 ++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/scrollbar/src/main.js b/packages/scrollbar/src/main.js
index c5aab5fe2..b4950b1c7 100644
--- a/packages/scrollbar/src/main.js
+++ b/packages/scrollbar/src/main.js
@@ -45,12 +45,15 @@ export default {
 
     if (gutter) {
       const gutterWith = `-${gutter}px`;
+      const gutterStyle = `margin-bottom: ${gutterWith}; margin-right: ${gutterWith};`;
 
       if (Array.isArray(this.wrapStyle)) {
         style = util.toObject(this.wrapStyle);
         style.marginRight = style.marginBottom = gutterWith;
       } else if (typeof this.wrapStyle === 'string') {
-        style += `margin-bottom: ${gutterWith}; margin-right: ${gutterWith};`;
+        style += gutterStyle;
+      } else {
+        style = gutterStyle;
       }
     }
     const view = h(this.tag, {
@@ -63,7 +66,7 @@ export default {
         ref="wrap"
         style={ style }
         onScroll={ this.handleScroll }
-        class={ [this.wrapClass, 'el-scrollbar__wrap el-scrollbar__wrap--hidden-default'] }>
+        class={ [this.wrapClass, 'el-scrollbar__wrap', gutter ? '' : 'el-scrollbar__wrap--hidden-default'] }>
         { [view] }
       </div>
     );
diff --git a/packages/theme-default/src/date-picker/time-spinner.css b/packages/theme-default/src/date-picker/time-spinner.css
index 9ba7148eb..fe4976ad6 100644
--- a/packages/theme-default/src/date-picker/time-spinner.css
+++ b/packages/theme-default/src/date-picker/time-spinner.css
@@ -5,6 +5,10 @@
     &.has-seconds {
       .el-time-spinner__wrapper {
         width: 33%;
+
+        .el-scrollbar__wrap:not(.el-scrollbar__wrap--hidden-default) {
+          padding-bottom: 15px;
+        }
       }
 
       .el-time-spinner__wrapper:nth-child(2) {