Merge branch 'round-boss' into develop

This commit is contained in:
Cole Gleason
2014-01-25 13:22:49 -06:00

View File

@@ -37,10 +37,10 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title=env.t('guild
| {{group.quest.hp | number:0}} / {{Content.quests[group.quest.key].hp}} | {{group.quest.hp | number:0}} / {{Content.quests[group.quest.key].hp}}
.hero-stats .hero-stats
.meter.health(title=env.t('bossHP')) .meter.health(title=env.t('bossHP'))
.bar(style='width: {{Shared.percent(group.quest.progress.hp, Content.quests[group.quest.key].boss.hp, \'up\')}}%;') .bar(style='width: {{Shared.percent(group.quest.progress.hp, Content.quests[group.quest.key].boss.hp)}}%;')
span.meter-text span.meter-text
i.icon-heart i.icon-heart
| {{Shared.percent(group.quest.progress.hp, Content.quests[group.quest.key].boss.hp, 'up')}} | {{group.quest.progress.hp | number:0}} / {{Content.quests[group.quest.key].boss.hp}}
div(ng-if='Content.quests[group.quest.key].collect') div(ng-if='Content.quests[group.quest.key].collect')
h4=env.t('collected') + ':' h4=env.t('collected') + ':'