From 4f65bab7bf4505b2151310da8cea7de2aa44d710 Mon Sep 17 00:00:00 2001 From: hairlessbear Date: Wed, 15 Jul 2015 01:00:08 -0400 Subject: [PATCH] Refactored inventory files with NPCs to cause popovers to be close to NPC --- website/views/options/inventory/mounts.jade | 24 ++++++++++--------- website/views/options/inventory/pets.jade | 24 ++++++++++--------- website/views/options/inventory/quests.jade | 21 ++++++++-------- .../options/inventory/seasonal-shop.jade | 21 ++++++++-------- .../options/inventory/time-travelers.jade | 21 ++++++++-------- 5 files changed, 59 insertions(+), 52 deletions(-) diff --git a/website/views/options/inventory/mounts.jade b/website/views/options/inventory/mounts.jade index 8b223d7d27..08aea109dd 100644 --- a/website/views/options/inventory/mounts.jade +++ b/website/views/options/inventory/mounts.jade @@ -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 diff --git a/website/views/options/inventory/pets.jade b/website/views/options/inventory/pets.jade index efe4f0035e..2d1a4e2b8e 100644 --- a/website/views/options/inventory/pets.jade +++ b/website/views/options/inventory/pets.jade @@ -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) diff --git a/website/views/options/inventory/quests.jade b/website/views/options/inventory/quests.jade index 35f5885c3c..84464461ef 100644 --- a/website/views/options/inventory/quests.jade +++ b/website/views/options/inventory/quests.jade @@ -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') diff --git a/website/views/options/inventory/seasonal-shop.jade b/website/views/options/inventory/seasonal-shop.jade index e8132a9043..f8d2f9c497 100644 --- a/website/views/options/inventory/seasonal-shop.jade +++ b/website/views/options/inventory/seasonal-shop.jade @@ -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:"", linkEnd: ""}) - .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:"", linkEnd: ""}) + .popover-content + p!=env.t('seasonalShopSummerText') .well(ng-if='User.user.achievements.rebirths > 0')=env.t('seasonalShopRebirth') diff --git a/website/views/options/inventory/time-travelers.jade b/website/views/options/inventory/time-travelers.jade index a0c861a29d..c87e0d3b9e 100644 --- a/website/views/options/inventory/time-travelers.jade +++ b/website/views/options/inventory/time-travelers.jade @@ -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: "", linkStartVicky: "", linkEnd: ""}) - .popover-content - p!=env.t('timeTravelersPopoverNoSub', {linkStart: "", linkEnd: ""}) + .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: "", linkStartVicky: "", linkEnd: ""}) + .popover-content + p!=env.t('timeTravelersPopoverNoSub', {linkStart: "", linkEnd: ""}) .row.stable(ng-if='user.purchased.plan.consecutive.trinkets > 0') .col-md-2