From b286b95153da220b86207e58f9d0ad4621981902 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Thu, 21 Mar 2013 16:31:23 -0600 Subject: [PATCH] add charts back in, temporary style --- src/app/tasks.coffee | 3 +-- views/app/header.html | 9 +++------ views/app/index.html | 1 + views/app/tasks.html | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/app/tasks.coffee b/src/app/tasks.coffee index 91daac794c..ddfd3dc889 100644 --- a/src/app/tasks.coffee +++ b/src/app/tasks.coffee @@ -135,8 +135,7 @@ module.exports.app = (appExports, model) -> options = { title: 'History' - #TODO use current background color: $(el).css('background-color), but convert to hex (see http://goo.gl/ql5pR) - backgroundColor: 'whiteSmoke' + backgroundColor: { fill:'transparent' } } chart = new google.visualization.LineChart(document.getElementById( chartSelector )) diff --git a/views/app/header.html b/views/app/header.html index fcd7af47a6..fba8d58202 100644 --- a/views/app/header.html +++ b/views/app/header.html @@ -16,15 +16,12 @@
- - - - + {#if _user.history.exp} +   + {/} {floor(_user.stats.exp)} / {tnl(_user.stats.lvl)}
- - diff --git a/views/app/index.html b/views/app/index.html index 38029dd15d..5fd2ec3382 100644 --- a/views/app/index.html +++ b/views/app/index.html @@ -41,6 +41,7 @@
+
diff --git a/views/app/tasks.html b/views/app/tasks.html index 8490085e71..6a9f39250b 100644 --- a/views/app/tasks.html +++ b/views/app/tasks.html @@ -78,7 +78,7 @@ {#if :task.history} - + {/} {#if :task.notes}