Merge pull request #1662 from OpenBazaar/fixStoreBugs

Minor fixes on the store tab
OpenBazaar · Jun 6, 2016 · e6069d2 · e6069d2
2 parents 711acf8 + 9a086f1
commit e6069d2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git 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
@@ -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>