From 9a086f165d33ea3042db65d58ff1414b84692c23 Mon Sep 17 00:00:00 2001
From: Josh Jeffryes <jjeffryes@gmail.com>
Date: Mon, 6 Jun 2016 14:43:45 -0400
Subject: [PATCH] - don't show does not ship to you icon on your own page -
 make spacing the same on both buttons in the confirm delete overlay

---
 css/obBase.css              | 10 ++++++++++
 js/templates/itemShort.html |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/css/obBase.css b/css/obBase.css
index 3b9a97c59..5769b8e1b 100644
--- a/css/obBase.css
+++ b/css/obBase.css
@@ -6171,6 +6171,16 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
   opacity: 0 !important;
 }
 
+#ov1.minEffects .fadeIn,
+#ov1.minEffects .statusBar.fadeIn,
+#ov1.minEffects #pageNav .statusBar.fadeIn,
+#ov1.minEffects #userPage .fadeIn,
+#ov1.minEffects #userPage #pageNav .fadeIn,
+#ov1.minEffects #userPage #pageNav .statusBar.fadeIn,
+#ov1.minEffects #userPage #obContainer #content .statusBar.fadeIn {
+  opacity: 1 !important;
+}
+
 #ov1.minEffects #sideBar .sideBarSlidShow {
   display: none;
 }
diff --git a/js/templates/itemShort.html b/js/templates/itemShort.html
index ca5df0469..f553d2a2b 100644
--- a/js/templates/itemShort.html
+++ b/js/templates/itemShort.html
@@ -72,7 +72,7 @@
             <div class="gridItemOverlay custCol-primary custCol-border fadeOut js-deleteOverlay">
               <span>Are you sure?</span>
               <div>
-                <a class="fontSize12 fontWeight400 textOpacity75 js-itemShortDeleteCancel"><%= polyglot.t('Cancel') %></a>
+                <a class="btn btn-txt btn-txtOnly fontSize12 fontWeight400 textOpacity75 js-itemShortDeleteCancel"><%= polyglot.t('Cancel') %></a>
                 <a class="btn btn-txt custCol-secondary marginLeft5 fontSize13 js-itemShortDeleteConfirm"><%= polyglot.t('YesDelete') %></a>
               </div>
             </div>
@@ -103,7 +103,7 @@
     </div>
   <% } %>
 
-  <% if(!shipsToYou && ob.ships_to.length != 0){ %>
+  <% if(!shipsToYou && ob.ships_to.length != 0 && !ob.ownPage){ %>
     <div class="listingDoesNotShipToYou cursorDefault tooltip" data-tooltip="<%= polyglot.t('DoesNotShip') %>">
       <span class="ion-cube fontSize14 marginLeft05 positionWrapper" style="color: #DCDCDC" ></span>
       <span class="listingsDoesNotShipToYouSlash">/</span>