diff options
author | Lauri Ojansivu <x@xet7.org> | 2018-12-09 00:21:35 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2018-12-09 00:21:35 +0200 |
commit | 472d637c9f83fb7741d3d25b9bd1486f0fd8b7bc (patch) | |
tree | 89bfd48d853884196afa778773b8576328fcac5d | |
parent | 20c86613a7d0aa7ba1330680dd7e52b7d55f4690 (diff) | |
parent | 5ac69ed7dea94feea5cf58cb4b1df846b3fadd37 (diff) | |
download | wekan-472d637c9f83fb7741d3d25b9bd1486f0fd8b7bc.tar.gz wekan-472d637c9f83fb7741d3d25b9bd1486f0fd8b7bc.tar.bz2 wekan-472d637c9f83fb7741d3d25b9bd1486f0fd8b7bc.zip |
Merge branch 'scrollbar-closes-card-chrome' of https://github.com/hupptechnologies/wekan into hupptechnologies-scrollbar-closes-card-chrome
-rw-r--r-- | .meteor/packages | 1 | ||||
-rw-r--r-- | .meteor/versions | 3 | ||||
-rw-r--r-- | client/components/cards/cardDetails.js | 1 | ||||
-rw-r--r-- | client/components/cards/cardDetails.styl | 12 | ||||
-rw-r--r-- | client/components/cards/checklists.styl | 1 |
5 files changed, 12 insertions, 6 deletions
diff --git a/.meteor/packages b/.meteor/packages index 3779a684..549b562f 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -89,3 +89,4 @@ mquandalle:moment msavin:usercache wekan:wekan-ldap wekan:accounts-cas +maazalik:malihu-jquery-custom-scrollbar diff --git a/.meteor/versions b/.meteor/versions index 6415eb8b..8c5c1569 100644 --- a/.meteor/versions +++ b/.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 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 |