summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenton Hamaluik <kenton@hamaluik.com>2015-10-10 23:08:50 -0600
committerKenton Hamaluik <kenton@hamaluik.com>2015-10-10 23:08:50 -0600
commit3507c6565bb16b5f45c6f269f7376902f8b1ff37 (patch)
tree64006f5f2604f60edbf89dd061a38512558891c9
parentfde2a39ee3dbbdfd5a6b648dbe17541343ac3b2a (diff)
downloadwekan-3507c6565bb16b5f45c6f269f7376902f8b1ff37.tar.gz
wekan-3507c6565bb16b5f45c6f269f7376902f8b1ff37.tar.bz2
wekan-3507c6565bb16b5f45c6f269f7376902f8b1ff37.zip
Made colours light grey in the labels dropdown
-rw-r--r--client/components/lists/listBody.js7
-rw-r--r--package.json11
2 files changed, 6 insertions, 12 deletions
diff --git a/client/components/lists/listBody.js b/client/components/lists/listBody.js
index e248f203..a60ffe25 100644
--- a/client/components/lists/listBody.js
+++ b/client/components/lists/listBody.js
@@ -214,14 +214,19 @@ BlazeComponent.extendComponent({
}));
},
template(value) {
+ // XXX the following is duplicated from editor.js and should be
+ // abstracted to keep things DRY
// add a "colour badge" in front of the label name
// but first, get the colour's name from its value
const colorName = currentBoard.labels.find((label) => {
return value === label.name || value === label.color;
}).color;
+ const valueSpan = (colorName === value)
+ ? `<span class="quiet">${value}</span>`
+ : value;
return (colorName && colorName !== '')
? `<div class="minicard-label card-label-${colorName}"
- title="${value}"></div> ${value}`
+ title="${value}"></div> ${valueSpan}`
: value;
},
replace(label) {
diff --git a/package.json b/package.json
deleted file mode 100644
index 8c9c7ff7..00000000
--- a/package.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "name": "Wekan",
- "description": "The open-source Trello-like kanban",
- "repository": "https://github.com/FuzzyWuzzie/wekan",
- "logo": "https://raw.githubusercontent.com/wekan/wekan/master/meta/icons/wekan-150.png",
- "keywords": ["productivity", "tool", "team", "kanban"],
- "website": "http://wekan.io",
- "engines": {
- "node": "0.10.40"
- }
-} \ No newline at end of file