diff options
author | Lauri Ojansivu <x@xet7.org> | 2019-01-25 22:20:00 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2019-01-25 22:20:00 +0200 |
commit | 95c178cee32d0c5a782ba0f39d717c1446eee22d (patch) | |
tree | 0e623b7087de42140cd12aeceb32a5ba85425649 /client/components/cards/cardDetails.jade | |
parent | 46a468b06dd5d4ca2338140bb2fd32958ccef85f (diff) | |
parent | be8f00ab8af080790758362d43c9efea2ed1b2eb (diff) | |
download | wekan-95c178cee32d0c5a782ba0f39d717c1446eee22d.tar.gz wekan-95c178cee32d0c5a782ba0f39d717c1446eee22d.tar.bz2 wekan-95c178cee32d0c5a782ba0f39d717c1446eee22d.zip |
Merge branch 'edge' into meteor-1.8
Diffstat (limited to 'client/components/cards/cardDetails.jade')
-rw-r--r-- | client/components/cards/cardDetails.jade | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade index c1e771cb..25316d04 100644 --- a/client/components/cards/cardDetails.jade +++ b/client/components/cards/cardDetails.jade @@ -234,7 +234,7 @@ template(name="cardDetailsActionsPopup") li: a.js-due-date {{_ 'editCardDueDatePopup-title'}} li: a.js-end-date {{_ 'editCardEndDatePopup-title'}} li: a.js-spent-time {{_ 'editCardSpentTimePopup-title'}} - li: a.js-set-card-color {{_ 'setCardColor-title'}} + li: a.js-set-card-color {{_ 'setCardColorPopup-title'}} hr ul.pop-over-list li: a.js-move-card-to-top {{_ 'moveCardToTop-title'}} @@ -337,14 +337,12 @@ template(name="cardMorePopup") a.js-delete(title="{{_ 'card-delete-notice'}}") {{_ 'delete'}} template(name="setCardColorPopup") - p.quiet - span.clearfix - label {{_ "select-color"}} form.edit-label .palette-colors: each colors - span.card-label.palette-color.js-palette-color(class="card-details-{{color}}") - if(isSelected color) - i.fa.fa-check + unless $eq color 'white' + span.card-label.palette-color.js-palette-color(class="card-details-{{color}}") + if(isSelected color) + i.fa.fa-check button.primary.confirm.js-submit {{_ 'save'}} button.js-remove-color.negate.wide.right {{_ 'unset-color'}} |