summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhupptechnologies <git@hupp.in>2018-12-08 17:20:56 +0530
committerhupptechnologies <git@hupp.in>2018-12-08 17:20:56 +0530
commit44a819226f9fffc2d5642d6aca084d81973bbc0b (patch)
tree568b538c25b72af4cfcce8c4a2cbf9cb1cf71b91
parent8a9a82fc8016163f4ad8ccc6edb0481613307749 (diff)
parent1bad6306416a0c0718a6b1717a7392726cb56472 (diff)
downloadwekan-44a819226f9fffc2d5642d6aca084d81973bbc0b.tar.gz
wekan-44a819226f9fffc2d5642d6aca084d81973bbc0b.tar.bz2
wekan-44a819226f9fffc2d5642d6aca084d81973bbc0b.zip
Merge branch 'devel' into edge
-rw-r--r--client/components/cards/cardDetails.styl3
-rw-r--r--client/components/cards/checklists.styl1
2 files changed, 3 insertions, 1 deletions
diff --git a/client/components/cards/cardDetails.styl b/client/components/cards/cardDetails.styl
index 1e290305..66ecc22d 100644
--- a/client/components/cards/cardDetails.styl
+++ b/client/components/cards/cardDetails.styl
@@ -14,6 +14,9 @@
box-shadow: 0 0 7px 0 darken(white, 30%)
transition: flex-basis 0.1s
+ .ps-scrollbar-y-rail
+ pointer-event: all
+
.card-details-canvas
width: 470px
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