Merge remote-tracking branch 'origin/master' into user-icons

This commit is contained in:
Julian Lam
2015-09-27 20:30:02 -04:00
18 changed files with 332 additions and 188 deletions

View File

@@ -73,6 +73,9 @@
};
helpers.generateCategoryBackground = function(category) {
if (!category) {
return '';
}
var style = [];
if (category.bgColor) {