diff options
author | Lauri Ojansivu <x@xet7.org> | 2019-10-29 19:05:44 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2019-10-29 19:05:44 +0200 |
commit | 7d6d3af54a2fc1fb68634725eb754b22f02fd430 (patch) | |
tree | 8703d32a5489dfce95e026bc535d6459c1743784 /client/components/cards | |
parent | 13a2bd6380ced34a828b9469e48786ed21fcb380 (diff) | |
download | wekan-7d6d3af54a2fc1fb68634725eb754b22f02fd430.tar.gz wekan-7d6d3af54a2fc1fb68634725eb754b22f02fd430.tar.bz2 wekan-7d6d3af54a2fc1fb68634725eb754b22f02fd430.zip |
Add Features: allowing lists to be sorted by modifiedAt when not in draggable mode.
Bug Fix #2093: the broken should be prior to file attachment feature introduced, and tested export board is working.
Thanks to whowillcare !
( xet7 merged this pull request manually from https://github.com/wekan/wekan/pull/2756 )
Closes #2093
Diffstat (limited to 'client/components/cards')
-rw-r--r-- | client/components/cards/minicard.jade | 11 | ||||
-rw-r--r-- | client/components/cards/minicard.js | 3 | ||||
-rw-r--r-- | client/components/cards/minicard.styl | 5 |
3 files changed, 14 insertions, 5 deletions
diff --git a/client/components/cards/minicard.jade b/client/components/cards/minicard.jade index 3806ce41..ba0c5707 100644 --- a/client/components/cards/minicard.jade +++ b/client/components/cards/minicard.jade @@ -3,6 +3,13 @@ template(name="minicard") class="{{#if isLinkedCard}}linked-card{{/if}}" class="{{#if isLinkedBoard}}linked-board{{/if}}" class="minicard-{{colorClass}}") + if isMiniScreen + .handle + .fa.fa-arrows + unless isMiniScreen + if showDesktopDragHandles + .handle + .fa.fa-arrows if cover .minicard-cover(style="background-image: url('{{cover.url}}');") if labels @@ -15,8 +22,6 @@ template(name="minicard") if hiddenMinicardLabelText .minicard-label(class="card-label-{{color}}" title="{{name}}") .minicard-title - .handle - .fa.fa-arrows if $eq 'prefix-with-full-path' currentBoard.presentParentTask .parent-prefix | {{ parentString ' > ' }} @@ -53,6 +58,8 @@ template(name="minicard") if getDue .date +minicardDueDate + if getEnd + +minicardEndDate if getSpentTime .date +cardSpentTime diff --git a/client/components/cards/minicard.js b/client/components/cards/minicard.js index 4c25c11d..4c76db46 100644 --- a/client/components/cards/minicard.js +++ b/client/components/cards/minicard.js @@ -26,6 +26,9 @@ BlazeComponent.extendComponent({ }).register('minicard'); Template.minicard.helpers({ + showDesktopDragHandles() { + return Meteor.user().hasShowDesktopDragHandles(); + }, hiddenMinicardLabelText() { return Meteor.user().hasHiddenMinicardLabelText(); }, diff --git a/client/components/cards/minicard.styl b/client/components/cards/minicard.styl index 7c27cba1..9997fd5f 100644 --- a/client/components/cards/minicard.styl +++ b/client/components/cards/minicard.styl @@ -105,8 +105,7 @@ right: 5px; top: 5px; display:none; - // @media only screen and (max-width: 1199px) { - @media only screen and (max-width: 800px) { + @media only screen { display:block; } .fa-arrows @@ -128,7 +127,7 @@ .badges float: left margin-top: 7px - color: darken(white, 80%) + color: darken(white, 50%) &:empty display: none |