Merge remote-tracking branch 'refs/remotes/origin/master' into types

# Conflicts:
#	js/templates/itemShort.html

Author: jjeffryes

css/obBase.css

@@ -477,7 +477,8 @@ form {
   flex-grow: 1;
 }
 
-.listingType {
+.listingType,
+.listingType.tooltip {
   background-color: #252525;
   color: #ffffff;
   position: absolute;
@@ -494,14 +495,23 @@ form {
   background: #252525;
   height: 18px; 
   width: 18px;
-  right: 15px;
+  right: 39px;
   padding: 10px; 
   position: absolute; 
   text-align: center; 
-  top: 137px;
+  top: 217px;
   transition: top .3s cubic-bezier(0, 0, 0.2, 1);
   border-radius: 32px;
-  opacity: .95;
+  opacity: 1;
+}
+
+.listingsDoesNotShipToYouSlash {
+  position: absolute; 
+  top: 3px; 
+  color: #DE2A14; 
+  font-size: 26px; 
+  left: 14px; 
+  font-weight: 700;
 }
 
 .noPointerEvents {
@@ -568,7 +578,7 @@ form {
 
 .userPage-subViews .gridItem:hover > .listingDoesNotShipToYou,
 .homeView .gridItem:hover > .listingDoesNotShipToYou {
-  top: 140px;
+  top: 203px;
   opacity: 1;
 }
 

js/templates/itemShort.html

@@ -8,10 +8,10 @@
 
 <div class="gridItem clearfix custCol-border">
 
-  <div class="itemImg row10 color-secondary custCol-secondary overflowHidden js-item <% if(!shipsToYou){ %>textOpacity25<% } %>" data-id="<%= ob.contract_hash %>">
+  <div class="itemImg row10 color-secondary custCol-secondary overflowHidden js-item" data-id="<%= ob.contract_hash %>">
     <div class="itemImg <% if(ob.cloak){ %> nsfw <% } %>" style="background-image: url(<%= ob.imageURL %>), url(imgs/defaultItem.png);"></div>
   </div>
-  <div class="table <% if(!shipsToYou){ %>textOpacity25<% } %>">
+  <div class="table">
     <div>
       <% if(ob.showAvatar) { %>
       <div class="thumbnail-small js-avatar tooltip" data-tooltip="<% if(ob.handle) { %><%= ob.handle %><% }else{ %><%= ob.guid %><% } %>" data-handle="<%= ob.handle %>"
@@ -84,21 +84,22 @@
 
   <% if(ob.contract_type){ %><!-- type is not yet implemented -->
     <div class="listingType borderRadius3 js-item textOpacity90">
-          <span class="<% print('listingType'+ob.contract_type) %>">
-            <% if(ob.contract_type == "PHYSICAL_GOOD"){ %>
-              <%= polyglot.t('Physical') %>
-            <% }else if(ob.contract_type == "DIGITAL_GOOD"){  %>
-              <%= polyglot.t('Digital') %>
-            <% }else{ %>
-              <%= polyglot.t('Service') %>
-            <% } %>
-          </span>
+      <span class="<% print('listingType'+ob.contract_type) %>">
+        <% if(ob.contract_type == "PHYSICAL_GOOD"){ %>
+          <%= polyglot.t('Physical') %>
+        <% }else if(ob.contract_type == "DIGITAL_GOOD"){  %>
+          <%= polyglot.t('Digital') %>
+        <% }else{ %>
+          <%= polyglot.t('Service') %>
+        <% } %>
+      </span>
     </div>
   <% } %>
 
   <% if(!shipsToYou && ob.ships_to.length != 0){ %>
     <div class="listingDoesNotShipToYou cursorDefault tooltip" data-tooltip="<%= polyglot.t('DoesNotShip') %>">
-      <span class="ion-minus-circled fontSize15 marginLeft05 positionWrapper" style="color: #DCDCDC" ></span>
+      <span class="ion-cube fontSize14 marginLeft05 positionWrapper" style="color: #DCDCDC" ></span>
+      <span class="listingsDoesNotShipToYouSlash">/</span>
     </div>
   <% } %>