summaryrefslogtreecommitdiffstats
path: root/client/components
diff options
context:
space:
mode:
Diffstat (limited to 'client/components')
-rw-r--r--client/components/cards/cardDetails.jade7
-rw-r--r--client/components/cards/cardDetails.js3
-rw-r--r--client/components/cards/cardDetails.styl4
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