diff options
| author | Jonathan Baird <jonathan@smithbox.com> | 2020-04-01 14:37:49 -0600 |
|---|---|---|
| committer | Jonathan Baird <jonathan@smithbox.com> | 2020-04-01 14:47:53 -0600 |
| commit | fcb1def355d4a94cc76ca401a23fdea1d02c6337 (patch) | |
| tree | 50b8a3de2a6e988837e5e2d088452b38c14e0a6a /client/components/cards | |
| parent | 9819c9f801128d07374b0703b482bdb83a672297 (diff) | |
| parent | 56667112d7fd146a9847794207e9a2224b1115d7 (diff) | |
| download | wekan-fcb1def355d4a94cc76ca401a23fdea1d02c6337.tar.gz wekan-fcb1def355d4a94cc76ca401a23fdea1d02c6337.tar.bz2 wekan-fcb1def355d4a94cc76ca401a23fdea1d02c6337.zip | |
Merge upstream/master
* commit '56667112d7fd146a9847794207e9a2224b1115d7':
Update ChangeLog.
Minicard labels on the top and title on bottom.
Update translations.
Update translations.
Add translations for Notification drawer like Trello.
Add translations for Board Settings / Allow Rename Board/Swimlane/Card.
Update ChangeLog.
Fix start-wekan.sh MongoDB port to 27017.
v3.87
Update translations.
Update ChangeLog.
Improvements on card details visualization.
Update ChangeLog.
Move "Rules" from "Board View" to "Board Settings".
Update ChangeLog.
Fix richer editor submit did not clear edit area.
Update ChangeLog.
Fix Browser always reload the whole page when I change one of the card color. Fixed by making label colors and text again editable. Regression from [Wekan v3.86 2)](https://github.com/wekan/wekan/commit/b9099a8b7ea6f63c79bdcbb871cb993b2cb7e325).
Diffstat (limited to 'client/components/cards')
| -rw-r--r-- | client/components/cards/attachments.jade | 2 | ||||
| -rw-r--r-- | client/components/cards/cardDetails.jade | 11 | ||||
| -rw-r--r-- | client/components/cards/minicard.styl | 2 |
3 files changed, 9 insertions, 6 deletions
diff --git a/client/components/cards/attachments.jade b/client/components/cards/attachments.jade index b695ea41..61454fa7 100644 --- a/client/components/cards/attachments.jade +++ b/client/components/cards/attachments.jade @@ -55,5 +55,5 @@ template(name="attachmentsGalery") unless currentUser.isWorker //li.attachment-item.add-attachment a.js-add-attachment - i.fa.fa-paperclip + i.fa.fa-plus | {{_ 'add-attachment' }} diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade index 615ae1d5..257ca0a8 100644 --- a/client/components/cards/cardDetails.jade +++ b/client/components/cards/cardDetails.jade @@ -203,6 +203,7 @@ template(name="cardDetails") if canModifyCard unless currentUser.isWorker if currentBoard.allowsDescriptionTitle + hr h3 i.fa.fa-align-left card-details-item-title {{_ 'description'}} @@ -229,6 +230,7 @@ template(name="cardDetails") a.js-close-inlined-form {{_ 'discard'}} else if getDescription if currentBoard.allowsDescriptionTitle + hr h3.card-details-item-title {{_ 'description'}} if currentBoard.allowsDescriptionText +viewer @@ -237,15 +239,16 @@ template(name="cardDetails") .card-checklist-attachmentGalerys .card-checklist-attachmentGalery.card-checklists if currentBoard.allowsChecklists + hr +checklists(cardId = _id) if currentBoard.allowsSubtasks hr +subtasks(cardId = _id) if currentBoard.allowsAttachments - //- hr - //- h3 - //- i.fa.fa-paperclip - //- | {{_ 'attachments'}} + hr + h3 + i.fa.fa-paperclip + | {{_ 'attachments'}} .card-checklist-attachmentGalery.card-attachmentGalery +attachmentsGalery diff --git a/client/components/cards/minicard.styl b/client/components/cards/minicard.styl index 8607e118..7d72a588 100644 --- a/client/components/cards/minicard.styl +++ b/client/components/cards/minicard.styl @@ -79,7 +79,7 @@ border-radius: top 2px .minicard-labels - float: right + float: none display: flex flex-wrap: wrap |