Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into classes

Browse Source 
Conflicts:
	public/css/index.styl
	src/models/user.js
	views/options/profile.jade
	views/shared/header/avatar.jade
	views/shared/tasks/lists.jade
	views/shared/tasks/task.jade
This commit is contained in:
Tyler Renelle
2013-12-01 19:51:36 -07:00
parent 91c141140d 1000796ddd
commit 19b6eb73e0
81 changed files with 1369 additions and 397 deletions
Download Patch File Download Diff File Expand all files Collapse all files
views/shared/header/header.jade
+1 -1
View File
@@ -19,7 +19,7 @@
.bar(style='width: {{percent(user.stats.exp,tnl(user.stats.lvl))}}%;')
span.meter-text
i.icon-star
| {{user.stats.exp | number:0}} / {{tnl(user.stats.lvl)}}
| {{user.stats.exp | number:0}} / {{tnl(user.stats.lvl) | number:0}}
// FIXME doesn't look great here, but the "Experience" CSS title rollover covers it where it was before
span(ng-show='user.history.exp')
a(ng-click='toggleChart("exp")', tooltip='Progress')