sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-03 08:21:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert #4291

Browse source 
This reverts commit a1ea6869b7.
This commit is contained in:
Tyler Renelle 2014-11-29 09:16:44 -07:00
parent 5823a25d06
commit 3204418af1
3 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
views/options/inventory/stable.jade
View file

@ -8,7 +8,7 @@ mixin petList(source)
div(popover-trigger='mouseenter', popover=env.t('petName', {potion: potion.text(env.language.code), egg: egg.text(env.language.code)}), popover-placement='bottom') div(popover-trigger='mouseenter', popover=env.t('petName', {potion: potion.text(env.language.code), egg: egg.text(env.language.code)}), popover-placement='bottom')
button(class="pet-button Pet-#{pet}", ng-if='user.items.pets["#{pet}"]>0', ng-class='{active: user.items.currentPet == "#{pet}", selectableInventory: selectedFood && !user.items.mounts["#{pet}"]}', ng-click='choosePet("#{egg.key}", "#{potion.key}")') button(class="pet-button Pet-#{pet}", ng-if='user.items.pets["#{pet}"]>0', ng-class='{active: user.items.currentPet == "#{pet}", selectableInventory: selectedFood && !user.items.mounts["#{pet}"]}', ng-click='choosePet("#{egg.key}", "#{potion.key}")')
.progress(ng-show='!user.items.mounts["#{pet}"] && "#{egg.key}"!="Egg"') .progress(ng-show='!user.items.mounts["#{pet}"] && "#{egg.key}"!="Egg"')
.progress-bar.progress-bar-success(ng-style='{width: (user.items.pets["#{pet}"]/.5) + "%"}') .progress-bar.progress-bar-success(style='width:{{user.items.pets["#{pet}"]/.5}}%')
button(class="pet-button pet-not-owned", ng-if='!user.items.pets["#{pet}"]') button(class="pet-button pet-not-owned", ng-if='!user.items.pets["#{pet}"]')
.PixelPaw .PixelPaw
button(class="pet-evolved pet-button Pet-#{pet}", ng-if='user.items.pets["#{pet}"]<0') button(class="pet-evolved pet-button Pet-#{pet}", ng-if='user.items.pets["#{pet}"]<0')

6
views/options/social/boss.jade
View file

@ -39,7 +39,7 @@ mixin boss(tavern, mobile)
div(class="quest_{{::group.quest.key}}") div(class="quest_{{::group.quest.key}}")
//- //-
.progress .progress
.bar(ng-style='{width: Shared.percent(group.quest.hp, Content.quests[group.quest.key].hp) + "%"};') .bar(style='width: {{Shared.percent(group.quest.hp, Content.quests[group.quest.key].hp)}}%;')
span.meter-text span.meter-text
span.glyphicon.glyphicon-heart span.glyphicon.glyphicon-heart
| {{group.quest.hp | number:0}} / {{Content.quests[group.quest.key].hp}} | {{group.quest.hp | number:0}} / {{Content.quests[group.quest.key].hp}}
@ -47,13 +47,13 @@ mixin boss(tavern, mobile)
.meter-label(tooltip=env.t('bossHP')) .meter-label(tooltip=env.t('bossHP'))
span.glyphicon.glyphicon-heart span.glyphicon.glyphicon-heart
.meter.health .meter.health
.bar(ng-style='{width: Shared.percent(progress.hp, boss.hp) + "%"};') .bar(style='width: {{Shared.percent(progress.hp, boss.hp)}}%;')
span.meter-text.value span.meter-text.value
| {{Math.ceil(progress.hp) | goldRoundThousandsToK}} / {{boss.hp | goldRoundThousandsToK}} | {{Math.ceil(progress.hp) | goldRoundThousandsToK}} / {{boss.hp | goldRoundThousandsToK}}
.meter-label(tooltip='Rage', ng-if='boss.rage') .meter-label(tooltip='Rage', ng-if='boss.rage')
span.glyphicon.glyphicon-fire span.glyphicon.glyphicon-fire
.meter.mana(ng-if='boss.rage',popover="{{::boss.rage.description()}}",popover-title="{{::boss.rage.title()}}",popover-trigger='mouseenter',popover-placement='right') .meter.mana(ng-if='boss.rage',popover="{{::boss.rage.description()}}",popover-title="{{::boss.rage.title()}}",popover-trigger='mouseenter',popover-placement='right')
.bar(ng-style='{width: Shared.percent(progress.rage, boss.rage.value) + "%"};') .bar(style='width: {{Shared.percent(progress.rage, boss.rage.value)}}%;')
span.meter-text.value span.meter-text.value
| {{Math.ceil(progress.rage) | goldRoundThousandsToK}} / {{boss.rage.value | goldRoundThousandsToK}} | {{Math.ceil(progress.rage) | goldRoundThousandsToK}} / {{boss.rage.value | goldRoundThousandsToK}}
div(ng-if='::Content.quests[group.quest.key].collect') div(ng-if='::Content.quests[group.quest.key].collect')

26
views/shared/header/header.jade
View file

@ -10,22 +10,22 @@
.meter-label(tooltip=env.t('health')) .meter-label(tooltip=env.t('health'))
span.glyphicon.glyphicon-heart span.glyphicon.glyphicon-heart
.meter.health .meter.health
.bar(ng-style='{width: Shared.percent(user.stats.hp, 50) + "%" }') .bar(style='width: {{Shared.percent(user.stats.hp, 50)}}%;')
span.meter-text.value span.meter-text.value
| {{Math.ceil(user.stats.hp)}} / 50 | {{Math.ceil(user.stats.hp)}} / 50
.meter-label(tooltip=env.t('experience')) .meter-label(tooltip=env.t('experience'))
span.glyphicon.glyphicon-star span.glyphicon.glyphicon-star
.meter.experience .meter.experience
.bar(ng-style='{width: Shared.percent(user.stats.exp,Shared.tnl(user.stats.lvl)) + "%" };') .bar(style='width: {{Shared.percent(user.stats.exp,Shared.tnl(user.stats.lvl))}}%;')
span.meter-text.value span.meter-text.value
span(ng-show='user.history.exp', tooltip=env.t('progress')) span(ng-show='user.history.exp', tooltip=env.t('progress'))
a(ng-click='toggleChart("exp")').glyphicon.glyphicon-signal a(ng-click='toggleChart("exp")').glyphicon.glyphicon-signal
span span
| {{Math.floor(user.stats.exp) | number:0}} / {{Shared.tnl(user.stats.lvl) | number:0}} | {{Math.floor(user.stats.exp) | number:0}} / {{Shared.tnl(user.stats.lvl) | number:0}}
.meter-label(tooltip='Mana', ng-if='user.flags.classSelected && !user.preferences.disableClasses') .meter-label(tooltip='Mana', ng-if='user.flags.classSelected && !user.preferences.disableClasses')
span.glyphicon.glyphicon-fire span.glyphicon.glyphicon-fire
.meter.mana(ng-if='user.flags.classSelected && !user.preferences.disableClasses') .meter.mana(ng-if='user.flags.classSelected && !user.preferences.disableClasses')
.bar(ng-style='{width: (user.stats.mp / user._statsComputed.maxMP * 100) + "%" };') .bar(style='width: {{user.stats.mp / user._statsComputed.maxMP * 100}}%;')
span.meter-text.value span.meter-text.value
span span
| {{Math.floor(user.stats.mp)}} / {{user._statsComputed.maxMP}} | {{Math.floor(user.stats.mp)}} / {{user._statsComputed.maxMP}}