Skip to content
This repository was archived by the owner on May 16, 2019. It is now read-only.

Commit e85cc4b

Browse files
committed
Merge pull request #1497 from OpenBazaar/shipicon2
updated ship icon
2 parents aee30b7 + 5f97ab9 commit e85cc4b

File tree

2 files changed

+17
-7
lines changed

2 files changed

+17
-7
lines changed

css/obBase.css

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -495,14 +495,23 @@ form {
495495
background: #252525;
496496
height: 18px;
497497
width: 18px;
498-
right: 15px;
498+
right: 39px;
499499
padding: 10px;
500500
position: absolute;
501501
text-align: center;
502-
top: 137px;
502+
top: 217px;
503503
transition: top .3s cubic-bezier(0, 0, 0.2, 1);
504504
border-radius: 32px;
505-
opacity: .95;
505+
opacity: 1;
506+
}
507+
508+
.listingsDoesNotShipToYouSlash {
509+
position: absolute;
510+
top: 3px;
511+
color: #DE2A14;
512+
font-size: 26px;
513+
left: 14px;
514+
font-weight: 700;
506515
}
507516

508517
.noPointerEvents {
@@ -569,7 +578,7 @@ form {
569578

570579
.userPage-subViews .gridItem:hover > .listingDoesNotShipToYou,
571580
.homeView .gridItem:hover > .listingDoesNotShipToYou {
572-
top: 140px;
581+
top: 203px;
573582
opacity: 1;
574583
}
575584

js/templates/itemShort.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88

99
<div class="gridItem clearfix custCol-border">
1010

11-
<div class="itemImg row10 color-secondary custCol-secondary overflowHidden js-item <% if(!shipsToYou){ %>textOpacity25<% } %>" data-id="<%= ob.contract_hash %>">
11+
<div class="itemImg row10 color-secondary custCol-secondary overflowHidden js-item" data-id="<%= ob.contract_hash %>">
1212
<div class="itemImg <% if(ob.cloak){ %> nsfw <% } %>" style="background-image: url(<%= ob.imageURL %>), url(imgs/defaultItem.png);"></div>
1313
</div>
14-
<div class="table <% if(!shipsToYou){ %>textOpacity25<% } %>">
14+
<div class="table">
1515
<div>
1616
<% if(ob.showAvatar) { %>
1717
<div class="thumbnail-small js-avatar tooltip" data-tooltip="<% if(ob.handle) { %><%= ob.handle %><% }else{ %><%= ob.guid %><% } %>" data-handle="<%= ob.handle %>"
@@ -97,7 +97,8 @@
9797

9898
<% if(!shipsToYou && ob.ships_to.length != 0){ %>
9999
<div class="listingDoesNotShipToYou cursorDefault tooltip" data-tooltip="<%= polyglot.t('DoesNotShip') %>">
100-
<span class="ion-minus-circled fontSize15 marginLeft05 positionWrapper" style="color: #DCDCDC" ></span>
100+
<span class="ion-cube fontSize14 marginLeft05 positionWrapper" style="color: #DCDCDC" ></span>
101+
<span class="listingsDoesNotShipToYouSlash">/</span>
101102
</div>
102103
<% } %>
103104

0 commit comments

Comments
 (0)