From 44a82c71e21bee8c3668b41edb6231f8791a525e Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Sun, 17 Nov 2013 07:40:19 -0600 Subject: [PATCH 1/4] Remove bland/harsh border styling on eggs and avatar options. Falls back to a button look that's much nicer. --- public/css/customizer.styl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/css/customizer.styl b/public/css/customizer.styl index fd9391fa9d..1bb04b43ba 100644 --- a/public/css/customizer.styl +++ b/public/css/customizer.styl @@ -22,7 +22,7 @@ menu line-height: 2 .customize-option - border: 1px solid grey; +// border: 1px solid grey; background-color: hsl(0, 0%, 93%); margin-bottom: 10px From cb64ab5a7d5a605dbd6c91d53ea4c7b0ae4d6dfe Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Sun, 17 Nov 2013 08:09:23 -0600 Subject: [PATCH 2/4] Make it easier for people to find "how to contribute" wiki page --- views/options/social/tavern.jade | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/views/options/social/tavern.jade b/views/options/social/tavern.jade index 0fad9b0fe0..eded297e3a 100644 --- a/views/options/social/tavern.jade +++ b/views/options/social/tavern.jade @@ -47,10 +47,12 @@ // Player Tiers .modal(style='position: relative;top: auto;left: auto;right: auto;margin: 0 auto 20px;z-index: 1;max-width: 100%;') .modal-header - h3 Player Tier Legend + h3 Player Tiers .modal-body small. - Click labels to expand. See contribution details. + Click tier labels below for more information.
+ Learn more about contributor rewards
+ Learn how to contribute to HabitRPG table.table.table-striped tr td From b701e2b24af00ff1cd78fc7cf516b635a040ae7d Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Sun, 17 Nov 2013 10:21:43 -0600 Subject: [PATCH 3/4] Go with the borderless option --- public/css/customizer.styl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/css/customizer.styl b/public/css/customizer.styl index 1bb04b43ba..021048869c 100644 --- a/public/css/customizer.styl +++ b/public/css/customizer.styl @@ -22,7 +22,7 @@ menu line-height: 2 .customize-option -// border: 1px solid grey; + border: 0px solid grey; background-color: hsl(0, 0%, 93%); margin-bottom: 10px From 5fffc32ad330f692c1b1c92b671d2328aa5929cb Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Sun, 17 Nov 2013 11:09:31 -0800 Subject: [PATCH 4/4] [#1844] some tasks have their "type" incorrectly set. I need to find out what's causing this, for now fix in database --- migrations/20131117_fix_task_types.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 migrations/20131117_fix_task_types.js diff --git a/migrations/20131117_fix_task_types.js b/migrations/20131117_fix_task_types.js new file mode 100644 index 0000000000..14d86cb55f --- /dev/null +++ b/migrations/20131117_fix_task_types.js @@ -0,0 +1,18 @@ +// TODO figure out why this is happening in the first place + +db.users.find({},{habits:1, dailys:1, todos:1, rewards:1}).forEach(function(user){ + _.each(user.habits, function(task){ + task.type = 'habit'; + }) + _.each(user.dailys, function(task){ + task.type = 'daily'; + }) + _.each(user.todos, function(task){ + task.type = 'todo'; + }) + _.each(user.rewards, function(task){ + task.type = 'reward'; + }) + + db.users.update({_id:user._id}, {$set:{habits: user.habits, dailys: user.dailys, todos: user.todos, rewards: user.rewards}}); +});