diff options
| author | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2019-01-22 23:35:12 +0100 |
|---|---|---|
| committer | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2019-01-24 16:51:06 +0100 |
| commit | 6e9bad57723919dc3fd63a5748902e9049320603 (patch) | |
| tree | eede4ef6e004aed94909ddf02a48ca9bd97742a0 /client | |
| parent | 5769d438a05d01bd5f35cd5830b7ad3c03a21ed2 (diff) | |
| download | wekan-6e9bad57723919dc3fd63a5748902e9049320603.tar.gz wekan-6e9bad57723919dc3fd63a5748902e9049320603.tar.bz2 wekan-6e9bad57723919dc3fd63a5748902e9049320603.zip | |
IFTTT: card colors: add an actual white entry
To unset the color through the IFTTT, we need a white entry.
However, we do not want to show the white enry in the hamburger
`Set Color` entry.
We can also give the `white` capability to the API, it won't hurt
and be more straightforward.
Diffstat (limited to 'client')
| -rw-r--r-- | client/components/cards/cardDetails.jade | 7 | ||||
| -rw-r--r-- | client/components/cards/cardDetails.js | 3 | ||||
| -rw-r--r-- | client/components/cards/cardDetails.styl | 4 |
3 files changed, 11 insertions, 3 deletions
diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade index f6cbbba6..25316d04 100644 --- a/client/components/cards/cardDetails.jade +++ b/client/components/cards/cardDetails.jade @@ -339,9 +339,10 @@ template(name="cardMorePopup") template(name="setCardColorPopup") 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'}} diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js index cc04b830..04620084 100644 --- a/client/components/cards/cardDetails.js +++ b/client/components/cards/cardDetails.js @@ -601,6 +601,9 @@ BlazeComponent.extendComponent({ }, isSelected(color) { + if (this.currentColor.get() === null) { + return color === 'white'; + } return this.currentColor.get() === color; }, diff --git a/client/components/cards/cardDetails.styl b/client/components/cards/cardDetails.styl index c18e1d2d..bf50c071 100644 --- a/client/components/cards/cardDetails.styl +++ b/client/components/cards/cardDetails.styl @@ -146,6 +146,10 @@ card-details-color(background, color...) if color color: color !important //overwrite text for better visibility +.card-details-white + card-details-color(unset, #000) //Black text for better visibility + border: 1px solid #eee + .card-details-green card-details-color(#3cb500, #ffffff) //White text for better visibility |