diff --git a/public/css/inventory.styl b/public/css/inventory.styl index bf036d0b2f..81602e1b9c 100644 --- a/public/css/inventory.styl +++ b/public/css/inventory.styl @@ -123,10 +123,3 @@ menu.pets .customize-menu .sell-inventory width: 162px height: 138px - -.quest-scroll - .popover - p - text-align: left; - hr - margin: 10px 0 diff --git a/public/css/shared.styl b/public/css/shared.styl index d05ebcbb95..50f270cc0c 100644 --- a/public/css/shared.styl +++ b/public/css/shared.styl @@ -38,6 +38,10 @@ a.hint:hover .vertical-20 vertical-align: 20% +.popover + hr + margin: 10px 0 + @media (max-width: 768px) .container-fluid padding-right: 5px diff --git a/views/options/inventory/inventory.jade b/views/options/inventory/inventory.jade index 40494ef32a..acba6d5494 100644 --- a/views/options/inventory/inventory.jade +++ b/views/options/inventory/inventory.jade @@ -44,7 +44,7 @@ script(type='text/ng-template', id='partials/options.inventory.seasonalshop.html | {{((item.specialClass == "wizard") && (item.type == "weapon")) + 1}}  span.Pet_Currency_Gem1x.inline-gems menu.pets-menu(label=env.t('quests')) - .quest-scroll(ng-repeat='quest in ::getSeasonalShopQuests()') + div(ng-repeat='quest in ::getSeasonalShopQuests()') button.customize-option(data-popover-html="{{::quest.previous && !user.achievements.quests[quest.previous] ? env.t('scrollsPre') : questPopover(quest) | markdown}}", popover-append-to-body='true', popover-title='{{::quest.text()}}', popover-trigger='mouseenter', popover-placement='right', ng-click='buyQuest(quest.key)', ng-class='(quest.previous && !user.achievements.quests[quest.previous]) ? "inventory_quest_scroll_locked inventory_quest_scroll_{{::quest.key}}_locked locked" : "inventory_quest_scroll inventory_quest_scroll_{{::quest.key}}"') p | {{::quest.value}}  @@ -119,7 +119,7 @@ script(type='text/ng-template', id='partials/options.inventory.drops.html') menu.pets-menu(label=(env.t('quests') + ' ({{questCount}})')) p.muted(ng-show='questCount < 1')=env.t('noScrolls') p.muted!=env.t('scrollsText1') + ' ' + env.t('scrollsText2') + '' - .quest-scroll(ng-repeat='(quest_key,points) in ownedItems(user.items.quests)', ng-init='quest = Content.quests[quest_key]') + div(ng-repeat='(quest_key,points) in ownedItems(user.items.quests)', ng-init='quest = Content.quests[quest_key]') button.customize-option(data-popover-html="{{:: quest.previous && !user.achievements.quests[quest.previous] ? env.t('scrollsPre') : questPopover(quest) | markdown}}", popover-append-to-body='true', popover-title='{{::quest.text()}}', popover-trigger='mouseenter', popover-placement='right', ng-click='showQuest(quest_key)', ng-class='(quest.previous && !user.achievements.quests[quest.previous]) ? "inventory_quest_scroll_locked inventory_quest_scroll_{{::quest.key}}_locked locked" : "inventory_quest_scroll inventory_quest_scroll_{{::quest.key}}"') .badge.badge-info.stack-count {{points}} @@ -214,7 +214,7 @@ script(type='text/ng-template', id='partials/options.inventory.drops.html') li.customize-menu menu.pets-menu(label=env.t('quests')) p.muted!=env.t('scrollsText1') + ' ' + env.t('scrollsText2') + '' - .quest-scroll(ng-repeat='quest in Content.quests', ng-if='quest.canBuy') + div(ng-repeat='quest in Content.quests', ng-if='quest.canBuy') button.customize-option(data-popover-html="{{::quest.previous && !user.achievements.quests[quest.previous] ? env.t('scrollsPre') : questPopover(quest) | markdown}}", popover-title='{{::quest.text()}}', popover-append-to-body="true", popover-trigger='mouseenter', ng-click='buyQuest(quest.key)', ng-class='(quest.previous && !user.achievements.quests[quest.previous]) ? "inventory_quest_scroll_locked inventory_quest_scroll_{{::quest.key}}_locked locked" : "inventory_quest_scroll inventory_quest_scroll_{{::quest.key}}"') p | {{::quest.value}}