mirror of
https://github.com/sudoxnym/habitica.git
synced 2026-08-03 08:21:07 +00:00
Fix version conflict
This commit is contained in:
parent
8f4016d669
commit
8d41c44ad7
1 changed files with 2 additions and 2 deletions
|
|
@ -40,12 +40,12 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title=env.t('guild
|
||||||
.bar(style='width: {{Shared.percent(group.quest.progress.hp, Content.quests[group.quest.key].boss.hp)}}%;')
|
.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
|
||||||
| {{group.quest.progress.hp | number:0}} / {{Content.quests[group.quest.key].boss.hp}}
|
| {{Shared.percent(group.quest.progress.hp, Content.quests[group.quest.key].boss.hp, 'up'}}
|
||||||
|
|
||||||
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') + ':'
|
||||||
table.table.table-striped
|
table.table.table-striped
|
||||||
tr(ng-repeat='(k,v) in group.quest.progress.collect', class='quest_collected_{{v >= Content.quests[group.quest.key].collect[k].count}}')
|
tr(ng-repeat='(k,v) in group.quest.progress.collect')
|
||||||
td
|
td
|
||||||
div(class='quest_{{group.quest.key}}_{{k}}') {{Content.quests[group.quest.key].collect[k].text}}
|
div(class='quest_{{group.quest.key}}_{{k}}') {{Content.quests[group.quest.key].collect[k].text}}
|
||||||
td
|
td
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue