From d0a9d8c581f9356f5e72ccb698fc3963c59e96cd Mon Sep 17 00:00:00 2001 From: Benjamin Tissoires Date: Fri, 25 Jan 2019 15:56:40 +0100 Subject: colors: add per list color Hamburger menu only. Note that I am definitively not responsible for the resulting Christmas tree. fixes #328 --- client/components/lists/listHeader.jade | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'client/components/lists/listHeader.jade') diff --git a/client/components/lists/listHeader.jade b/client/components/lists/listHeader.jade index 25ab8c20..48005eaf 100644 --- a/client/components/lists/listHeader.jade +++ b/client/components/lists/listHeader.jade @@ -1,5 +1,6 @@ template(name="listHeader") - .list-header.js-list-header + .list-header.js-list-header( + class="{{#if colorClass}}list-header-{{colorClass}}{{/if}}") +inlinedForm +editListTitleForm else @@ -49,6 +50,9 @@ template(name="listActionPopup") li: a.js-toggle-watch-list {{#if isWatching}}{{_ 'unwatch'}}{{else}}{{_ 'watch'}}{{/if}} unless currentUser.isCommentOnly hr + ul.pop-over-list + li: a.js-set-color-list {{_ 'set-color-list'}} + hr ul.pop-over-list if cards.count li: a.js-select-cards {{_ 'list-select-cards'}} @@ -111,3 +115,12 @@ template(name="wipLimitErrorPopup") p {{_ 'wipLimitErrorPopup-dialog-pt1'}} p {{_ 'wipLimitErrorPopup-dialog-pt2'}} button.full.js-back-view(type="submit") {{_ 'cancel'}} + +template(name="setListColorPopup") + form.edit-label + .palette-colors: each colors + span.card-label.palette-color.js-palette-color(class="list-header-{{color}}") + if(isSelected color) + i.fa.fa-check + button.primary.confirm.js-submit {{_ 'save'}} + button.js-remove-color.negate.wide.right {{_ 'unset-color'}} -- cgit v1.2.3-1-g7c22 From 97d95b4bcbcab86629e368ea41bb9f00450b21f6 Mon Sep 17 00:00:00 2001 From: Benjamin Tissoires Date: Fri, 25 Jan 2019 15:58:52 +0100 Subject: ui: lists: make sure all lists boxes are the same height When `Show card count` is enabled, the lists with the card counts have two lines of text while the lists without have only one. This results in the box around the list headers are not of the same size and this is visible when setting a color to the list. --- client/components/lists/listHeader.jade | 1 + 1 file changed, 1 insertion(+) (limited to 'client/components/lists/listHeader.jade') diff --git a/client/components/lists/listHeader.jade b/client/components/lists/listHeader.jade index 48005eaf..eafcc510 100644 --- a/client/components/lists/listHeader.jade +++ b/client/components/lists/listHeader.jade @@ -1,5 +1,6 @@ template(name="listHeader") .list-header.js-list-header( + class="{{#if limitToShowCardsCount}}list-header-card-count{{/if}}" class="{{#if colorClass}}list-header-{{colorClass}}{{/if}}") +inlinedForm +editListTitleForm -- cgit v1.2.3-1-g7c22