Browse Source

Merge branch 'scrollbar-closes-card-chrome' of https://github.com/hupptechnologies/wekan into hupptechnologies-scrollbar-closes-card-chrome

Lauri Ojansivu 6 years ago
parent
commit
472d637c9f

+ 1 - 0
.meteor/packages

@@ -89,3 +89,4 @@ mquandalle:moment
 msavin:usercache
 wekan:wekan-ldap
 wekan:accounts-cas
+maazalik:malihu-jquery-custom-scrollbar

+ 0 - 3
.meteor/versions

@@ -179,7 +179,4 @@ useraccounts:unstyled@1.14.2
 verron:autosize@3.0.8
 webapp@1.4.0
 webapp-hashing@1.0.9
-wekan:accounts-cas@0.1.0
-wekan:wekan-ldap@0.0.2
-yasaricli:slugify@0.0.7
 zimme:active-route@2.3.2

+ 1 - 0
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);
     }

+ 10 - 2
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

+ 0 - 1
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