Refactored inventory files with NPCs to cause popovers to be close to NPC

This commit is contained in:
hairlessbear
2015-07-15 01:00:08 -04:00
parent b591428717
commit 4f65bab7bf
5 changed files with 59 additions and 52 deletions
+13 -11
View File
@@ -14,17 +14,19 @@ mixin mountList(source)
-}
.container-fluid
.stable.row
.col-md-2
div(class="#{env.worldDmg.stables ? 'npc_matt_broken' : 'npc_matt'}")
.col-md-10
.popover.static-popover.fade.right.in
.arrow
h3.popover-title
a(target='_blank', href='http://www.kickstarter.com/profile/mattboch')=env.t('mattBoch')
.popover-content
p=env.t('mattShall', {name: "{{user.profile.name}}"})
h4= env.t('mountMasterProgress') + ': {{mountCount}} / {{totalMounts}} ' + env.t('mountsTamed')
.stable.row-fluid
table
tr
td
div(class="#{env.worldDmg.stables ? 'npc_matt_broken' : 'npc_matt'}")
td
.popover.static-popover.fade.right.in
.arrow
h3.popover-title
a(target='_blank', href='http://www.kickstarter.com/profile/mattboch')=env.t('mattBoch')
.popover-content
p=env.t('mattShall', {name: "{{user.profile.name}}"})
h4= env.t('mountMasterProgress') + ': {{mountCount}} / {{totalMounts}} ' + env.t('mountsTamed')
.col-md-12
+mountList(env.Content.dropEggs)
.col-md-12
+13 -11
View File
@@ -14,17 +14,19 @@ mixin petList(source)
button(class="pet-evolved pet-button Pet-#{pet}", ng-if='user.items.pets["#{pet}"]<0')
.container-fluid
.stable.row
.col-md-2
div(class="#{env.worldDmg.stables ? 'npc_matt_broken' : 'npc_matt'}")
.col-md-10
.popover.static-popover.fade.right.in
.arrow
h3.popover-title
a(target='_blank', href='http://www.kickstarter.com/profile/mattboch')=env.t('mattBoch')
.popover-content
p=env.t('mattBochText1')
h4= env.t('beastMasterProgress') + ': {{petCount}} / {{totalPets}} ' + env.t('petsFound')
.stable.row-fluid
table
tr
td
div(class="#{env.worldDmg.stables ? 'npc_matt_broken' : 'npc_matt'}")
td
.popover.static-popover.fade.right.in
.arrow
h3.popover-title
a(target='_blank', href='http://www.kickstarter.com/profile/mattboch')=env.t('mattBoch')
.popover-content
p=env.t('mattBochText1')
h4=env.t('beastMasterProgress') + ': {{petCount}} / {{totalPets}} ' + env.t('petsFound')
.col-md-12
+petList(env.Content.dropEggs)
+11 -10
View File
@@ -2,16 +2,17 @@
- var questCategories = {'unlockable':'unlockableQuests','gold':'goldQuests','pet':'petQuests'}
.container-fluid
.row
.col-md-1
.npc_ian
.col-md-11
.popover.static-popover.fade.right.in
.arrow
h3.popover-title=env.t('ian')
.popover-content
p=env.t('ianText')
.row-fluid
table
tr
td
.npc_ian
td
.popover.static-popover.fade.right.in
.arrow
h3.popover-title=env.t('ian')
.popover-content
p=env.t('ianText')
.row
.col-md-6
h3.equipment-title=env.t('yourQuests')
@@ -1,14 +1,15 @@
.container-fluid
.stable.row
.col-md-2
.seasonalshop_summer2015
.col-md-10
.popover.static-popover.fade.right.in
.arrow
h3.popover-title!=env.t('seasonalShopTitle', {linkStart:"<a href='http://blog.habitrpg.com/who' target='_blank'>", linkEnd: "</a>"})
.popover-content
p!=env.t('seasonalShopSummerText')
.stable.row-fluid
table
tr
td
.seasonalshop_summer2015
td
.popover.static-popover.fade.right.in
.arrow
h3.popover-title!=env.t('seasonalShopTitle', {linkStart:"<a href='http://blog.habitrpg.com/who' target='_blank'>", linkEnd: "</a>"})
.popover-content
p!=env.t('seasonalShopSummerText')
.well(ng-if='User.user.achievements.rebirths > 0')=env.t('seasonalShopRebirth')
@@ -1,14 +1,15 @@
.container-fluid
.stable.row(ng-if='user.purchased.plan.consecutive.trinkets <= 0')
.col-md-2
.npc_timetravelers
.col-md-10
.popover.static-popover.fade.right.in
.arrow
h3.popover-title!=env.t('timeTravelersTitleNoSub', {linkStartTyler: "<a href='https://github.com/lefnire' target='_blank'>", linkStartVicky: "<a href='http://blog.habitrpg.com/who' target='_blank'>", linkEnd: "</a>"})
.popover-content
p!=env.t('timeTravelersPopoverNoSub', {linkStart: "<a href='https://habitrpg.com/#/options/settings/subscription' target='_blank'>", linkEnd: "</a>"})
.stable.row-fluid(ng-if='user.purchased.plan.consecutive.trinkets <= 0')
table
tr
td
.npc_timetravelers
td
.popover.static-popover.fade.right.in
.arrow
h3.popover-title!=env.t('timeTravelersTitleNoSub', {linkStartTyler: "<a href='https://github.com/lefnire' target='_blank'>", linkStartVicky: "<a href='http://blog.habitrpg.com/who' target='_blank'>", linkEnd: "</a>"})
.popover-content
p!=env.t('timeTravelersPopoverNoSub', {linkStart: "<a href='https://habitrpg.com/#/options/settings/subscription' target='_blank'>", linkEnd: "</a>"})
.row.stable(ng-if='user.purchased.plan.consecutive.trinkets > 0')
.col-md-2