Merge branch 'edge' into meteor-1.8

3 files changed, 11 insertions, 3 deletions

diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js
index da0f126a..e17e7467 100644
--- a/client/components/cards/cardDetails.js
+++ b/client/components/cards/cardDetails.js
@@ -112,6 +112,7 @@ BlazeComponent.extendComponent({
   onRendered() {
     if (!Utils.isMiniScreen()) {
       Meteor.setTimeout(() => {
+        $('.card-details').mCustomScrollbar({theme:'minimal-dark', setWidth: false, setLeft: 0, scrollbarPosition: 'outside', mouseWheel: true });
         this.scrollParentContainer();
       }, 500);
     }
diff --git a/client/components/cards/cardDetails.styl b/client/components/cards/cardDetails.styl
index 1e290305..1dc56f58 100644
--- a/client/components/cards/cardDetails.styl
+++ b/client/components/cards/cardDetails.styl
@@ -1,9 +1,9 @@
 @import 'nib'
 
 .card-details
-  padding: 0 20px
+  padding: 0
   flex-shrink: 0
-  flex-basis: 470px
+  flex-basis: 510px
   will-change: flex-basis
   overflow-y: scroll
   overflow-x: hidden
@@ -14,8 +14,16 @@
   box-shadow: 0 0 7px 0 darken(white, 30%)
   transition: flex-basis 0.1s
 
+  .mCustomScrollBox
+    padding-left: 0
+
+  .ps-scrollbar-y-rail
+    pointer-event: all
+    position: absolute;
+
   .card-details-canvas
     width: 470px
+    padding-left: 20px;
 
   .card-details-header
     margin: 0 -20px 5px
diff --git a/client/components/cards/checklists.styl b/client/components/cards/checklists.styl
index 70fb5007..d48c1851 100644
--- a/client/components/cards/checklists.styl
+++ b/client/components/cards/checklists.styl
@@ -51,7 +51,6 @@ textarea.js-add-checklist-item, textarea.js-edit-checklist-item
   padding-right: 3%
   z-index: 17
   border-radius: 3px
-  top: 50%
 
   p
     position: relative