From 49ec9d2e5c8f22934f365d076246c8b20e5246ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Larivi=C3=A8re?= Date: Thu, 30 Jan 2014 19:57:50 -0500 Subject: [PATCH 1/4] Fixed inventory alignment. Issue #2158 --- views/options/inventory/inventory.jade | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/views/options/inventory/inventory.jade b/views/options/inventory/inventory.jade index cc0c8d0d56..72214e59c5 100644 --- a/views/options/inventory/inventory.jade +++ b/views/options/inventory/inventory.jade @@ -1,17 +1,18 @@ script(type='text/ng-template', id='partials/options.inventory.equipment.html') .row-fluid .span6.border-right - h3=env.t('battleGear') - small=env.t('battleGearText') + h3(style="display: inline-block; vertical-align: middle;")=env.t('battleGear') +   + i.icon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover=env.t('battleGearText'), style="display: inline-block;") li.customize-menu.inventory-gear menu.pets-menu(label='{{label}}', ng-repeat='(klass,label) in {base:"Base", warrior:"Warrior", wizard:"Wizard", rogue:"Rogue", healer:"Healer", special:"Special"}', ng-show='gear[klass]') div(ng-repeat='item in gear[klass]') button.customize-option(popover='{{item.notes}}', popover-title='{{item.text}}', popover-trigger='mouseenter', popover-placement='right', ng-click='user.ops.equip({params:{key:item.key}})', class='shop_{{item.key}}', ng-class='{selectableInventory: user.items.gear.equipped[item.type] == item.key}') .span6 - h3=env.t('costume') - small=env.t('costumeText') - br - label.checkbox.inline + h3(style="display: inline-block; vertical-align: middle;")=env.t('costume') +   + i.icon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover=env.t('costumeText')) + label.checkbox.inline(style="margin-left: 20px;") input(type="checkbox", ng-model="user.preferences.costume", ng-click='set({"preferences.costume":!user.preferences.costume})') =env.t('useCostume') li.customize-menu(ng-if='user.preferences.costume') From 2e64b03a638c7c84bcfe44fdef116d7eced98163 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Larivi=C3=A8re?= Date: Thu, 30 Jan 2014 19:58:34 -0500 Subject: [PATCH 2/4] Fixed inventory alignment. Issue #2158 --- views/options/inventory/inventory.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/options/inventory/inventory.jade b/views/options/inventory/inventory.jade index 72214e59c5..706f2ce5e4 100644 --- a/views/options/inventory/inventory.jade +++ b/views/options/inventory/inventory.jade @@ -1,7 +1,7 @@ script(type='text/ng-template', id='partials/options.inventory.equipment.html') .row-fluid .span6.border-right - h3(style="display: inline-block; vertical-align: middle;")=env.t('battleGear') + h3=env.t('battleGear')   i.icon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover=env.t('battleGearText'), style="display: inline-block;") li.customize-menu.inventory-gear From 875698c111f6138e01c2e12a88a0be3f0187b547 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Larivi=C3=A8re?= Date: Sat, 1 Feb 2014 12:52:38 -0500 Subject: [PATCH 3/4] Created new CSS entry for equipment-title and modified inventory.jade accordingly --- public/css/inventory.styl | 4 ++++ views/options/inventory/inventory.jade | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/public/css/inventory.styl b/public/css/inventory.styl index 0dbf947dec..b18a3b2ed8 100644 --- a/public/css/inventory.styl +++ b/public/css/inventory.styl @@ -15,6 +15,10 @@ .modal-header .gem-wallet padding-top: 0px +.equipment-title + display: inline-block + vertical-align: middle + // pets (this will all change when pet system is overhauled) .pet-grid diff --git a/views/options/inventory/inventory.jade b/views/options/inventory/inventory.jade index 706f2ce5e4..ea69911932 100644 --- a/views/options/inventory/inventory.jade +++ b/views/options/inventory/inventory.jade @@ -1,7 +1,7 @@ script(type='text/ng-template', id='partials/options.inventory.equipment.html') .row-fluid .span6.border-right - h3=env.t('battleGear') + h3.equipment-title=env.t('battleGear')   i.icon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover=env.t('battleGearText'), style="display: inline-block;") li.customize-menu.inventory-gear @@ -9,7 +9,7 @@ script(type='text/ng-template', id='partials/options.inventory.equipment.html') div(ng-repeat='item in gear[klass]') button.customize-option(popover='{{item.notes}}', popover-title='{{item.text}}', popover-trigger='mouseenter', popover-placement='right', ng-click='user.ops.equip({params:{key:item.key}})', class='shop_{{item.key}}', ng-class='{selectableInventory: user.items.gear.equipped[item.type] == item.key}') .span6 - h3(style="display: inline-block; vertical-align: middle;")=env.t('costume') + h3.equipment-title=env.t('costume')   i.icon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover=env.t('costumeText')) label.checkbox.inline(style="margin-left: 20px;") From 0afaa69d7dd48d9d47261fa8eadb0e1ccd1727ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Larivi=C3=A8re?= Date: Sat, 1 Feb 2014 13:17:21 -0500 Subject: [PATCH 4/4] Created new CSS entry for equipment title and modified inventory.jade accordingly --- views/options/inventory/inventory.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/options/inventory/inventory.jade b/views/options/inventory/inventory.jade index ea69911932..fccf266dff 100644 --- a/views/options/inventory/inventory.jade +++ b/views/options/inventory/inventory.jade @@ -3,7 +3,7 @@ script(type='text/ng-template', id='partials/options.inventory.equipment.html') .span6.border-right h3.equipment-title=env.t('battleGear')   - i.icon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover=env.t('battleGearText'), style="display: inline-block;") + i.icon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover=env.t('battleGearText')) li.customize-menu.inventory-gear menu.pets-menu(label='{{label}}', ng-repeat='(klass,label) in {base:"Base", warrior:"Warrior", wizard:"Wizard", rogue:"Rogue", healer:"Healer", special:"Special"}', ng-show='gear[klass]') div(ng-repeat='item in gear[klass]')