From f8039f48a69a7bd5d7f1895e6bde4533615cc98e Mon Sep 17 00:00:00 2001
From: Keith Holliday <krh121791@yahoo.com>
Date: Sat, 10 Dec 2016 22:09:06 -0600
Subject: [PATCH] Styled merch button to have highlight (#8273)

---
 website/client-old/css/options.styl       | 7 +++++--
 website/common/locales/en/merch.json      | 1 +
 website/views/options/inventory/menu.jade | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/website/client-old/css/options.styl b/website/client-old/css/options.styl
index 3206dc7659..24f02fa72c 100644
--- a/website/client-old/css/options.styl
+++ b/website/client-old/css/options.styl
@@ -16,6 +16,11 @@
     @extend $hrpg-button
     hrpg-button-color-mixin($color-options-menu)
 
+    &.highlight
+      hrpg-button-color-mixin($color-options-submenu, true)
+      border: 1px solid;
+      border-radius: 3px;
+
 .options-submenu
   margin-top: -1.618em
   background-color: $color-options-submenu
@@ -33,5 +38,3 @@
     padding: 1em 0.618em 0 0.618em
     border: 1px solid darken($color-options-menu, 12%)
     border-top: none
-
-
diff --git a/website/common/locales/en/merch.json b/website/common/locales/en/merch.json
index f98cb8b263..cca4a94a81 100644
--- a/website/common/locales/en/merch.json
+++ b/website/common/locales/en/merch.json
@@ -1,5 +1,6 @@
 {
   "merch" : "Merchandise",
+  "merchandiseDescription": "Looking for t-shirts, mugs, or stickers to show off your Habitica pride? Click here!",
 
   "merch-teespring-summary" : "Teespring is a platform that makes it easy for anyone to create and sell high-quality products people love, with no cost or risk.",
   "merch-teespring-goto" : "Get a Habitica T-shirt",
diff --git a/website/views/options/inventory/menu.jade b/website/views/options/inventory/menu.jade
index ee6ccabdf7..eb84b6efe7 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')
-  li.pull-right
+  li.pull-right.highlight(tooltip=env.t('merchandiseDescription'))
     a(href='/static/merch')=env.t('merch')
 
 .tab-content