Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-18 00:10:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

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

Browse source
This commit is contained in:
Lauri Ojansivu 2018-12-09 00:21:35 +02:00
commit 472d637c9f
5 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.meteor/packages
View file

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

3
.meteor/versions
View file

@ -179,7 +179,4 @@ useraccounts:unstyled@1.14.2
verron:autosize@3.0.8 verron:autosize@3.0.8
webapp@1.4.0 webapp@1.4.0
webapp-hashing@1.0.9 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 zimme:active-route@2.3.2

1
client/components/cards/cardDetails.js
View file

@ -112,6 +112,7 @@ BlazeComponent.extendComponent({
onRendered() { onRendered() {
if (!Utils.isMiniScreen()) { if (!Utils.isMiniScreen()) {
Meteor.setTimeout(() => { Meteor.setTimeout(() => {
$('.card-details').mCustomScrollbar({theme:'minimal-dark', setWidth: false, setLeft: 0, scrollbarPosition: 'outside', mouseWheel: true });
this.scrollParentContainer(); this.scrollParentContainer();
}, 500); }, 500);
} }

12
client/components/cards/cardDetails.styl
View file

@ -1,9 +1,9 @@
@import 'nib' @import 'nib'
.card-details .card-details
padding: 0 20px padding: 0
flex-shrink: 0 flex-shrink: 0
flex-basis: 470px flex-basis: 510px
will-change: flex-basis will-change: flex-basis
overflow-y: scroll overflow-y: scroll
overflow-x: hidden overflow-x: hidden
@ -14,8 +14,16 @@
box-shadow: 0 0 7px 0 darken(white, 30%) box-shadow: 0 0 7px 0 darken(white, 30%)
transition: flex-basis 0.1s transition: flex-basis 0.1s
.mCustomScrollBox
padding-left: 0
.ps-scrollbar-y-rail
pointer-event: all
position: absolute;
.card-details-canvas .card-details-canvas
width: 470px width: 470px
padding-left: 20px;
.card-details-header .card-details-header
margin: 0 -20px 5px margin: 0 -20px 5px

1
client/components/cards/checklists.styl
View file

@ -51,7 +51,6 @@ textarea.js-add-checklist-item, textarea.js-edit-checklist-item
padding-right: 3% padding-right: 3%
z-index: 17 z-index: 17
border-radius: 3px border-radius: 3px
top: 50%
p p
position: relative position: relative