From 605a5a1d5c8ee74c6dfb9a86cc5a34c4a612b5a8 Mon Sep 17 00:00:00 2001 From: Travis Husman Date: Thu, 8 Dec 2016 08:19:13 -0800 Subject: [PATCH 1/3] Adding a merchandise link to the marketplace selector. fixes #8265 --- website/views/options/inventory/menu.jade | 3 +++ 1 file changed, 3 insertions(+) diff --git a/website/views/options/inventory/menu.jade b/website/views/options/inventory/menu.jade index 576185fd8a..3262261526 100644 --- a/website/views/options/inventory/menu.jade +++ b/website/views/options/inventory/menu.jade @@ -20,6 +20,9 @@ ul.options-menu li(ng-class="{ active: $state.includes('options.inventory.seasonalshop') }") a(ui-sref='options.inventory.seasonalshop') =env.t('seasonalShop') + div.pull-right + a(href='/static/merch')=env.t('merch') + .tab-content .tab-pane.active From d13bded647e8ab51929715b8a8abdfcac43561fd Mon Sep 17 00:00:00 2001 From: Travis Husman Date: Fri, 9 Dec 2016 07:31:48 -0800 Subject: [PATCH 2/3] Updating the merchandise link to look like a list item. --- website/views/options/inventory/menu.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/views/options/inventory/menu.jade b/website/views/options/inventory/menu.jade index 3262261526..8ac739b848 100644 --- a/website/views/options/inventory/menu.jade +++ b/website/views/options/inventory/menu.jade @@ -20,7 +20,7 @@ ul.options-menu li(ng-class="{ active: $state.includes('options.inventory.seasonalshop') }") a(ui-sref='options.inventory.seasonalshop') =env.t('seasonalShop') - div.pull-right + li.pull-right a(href='/static/merch')=env.t('merch') From 8112d46ea40eb4cd8c3f4db746405c617fab0638 Mon Sep 17 00:00:00 2001 From: Travis Husman Date: Fri, 9 Dec 2016 07:32:40 -0800 Subject: [PATCH 3/3] Removing line break --- website/views/options/inventory/menu.jade | 1 - 1 file changed, 1 deletion(-) diff --git a/website/views/options/inventory/menu.jade b/website/views/options/inventory/menu.jade index 8ac739b848..ee6ccabdf7 100644 --- a/website/views/options/inventory/menu.jade +++ b/website/views/options/inventory/menu.jade @@ -23,7 +23,6 @@ ul.options-menu li.pull-right a(href='/static/merch')=env.t('merch') - .tab-content .tab-pane.active div(ui-view)