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

Commit e6069d2

Browse files
committed
Merge pull request #1662 from OpenBazaar/fixStoreBugs
Minor fixes on the store tab
2 parents 711acf8 + 9a086f1 commit e6069d2

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

css/obBase.css

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6171,6 +6171,16 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
61716171
opacity: 0 !important;
61726172
}
61736173

6174+
#ov1.minEffects .fadeIn,
6175+
#ov1.minEffects .statusBar.fadeIn,
6176+
#ov1.minEffects #pageNav .statusBar.fadeIn,
6177+
#ov1.minEffects #userPage .fadeIn,
6178+
#ov1.minEffects #userPage #pageNav .fadeIn,
6179+
#ov1.minEffects #userPage #pageNav .statusBar.fadeIn,
6180+
#ov1.minEffects #userPage #obContainer #content .statusBar.fadeIn {
6181+
opacity: 1 !important;
6182+
}
6183+
61746184
#ov1.minEffects #sideBar .sideBarSlidShow {
61756185
display: none;
61766186
}

js/templates/itemShort.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<div class="gridItemOverlay custCol-primary custCol-border fadeOut js-deleteOverlay">
7373
<span>Are you sure?</span>
7474
<div>
75-
<a class="fontSize12 fontWeight400 textOpacity75 js-itemShortDeleteCancel"><%= polyglot.t('Cancel') %></a>
75+
<a class="btn btn-txt btn-txtOnly fontSize12 fontWeight400 textOpacity75 js-itemShortDeleteCancel"><%= polyglot.t('Cancel') %></a>
7676
<a class="btn btn-txt custCol-secondary marginLeft5 fontSize13 js-itemShortDeleteConfirm"><%= polyglot.t('YesDelete') %></a>
7777
</div>
7878
</div>
@@ -103,7 +103,7 @@
103103
</div>
104104
<% } %>
105105

106-
<% if(!shipsToYou && ob.ships_to.length != 0){ %>
106+
<% if(!shipsToYou && ob.ships_to.length != 0 && !ob.ownPage){ %>
107107
<div class="listingDoesNotShipToYou cursorDefault tooltip" data-tooltip="<%= polyglot.t('DoesNotShip') %>">
108108
<span class="ion-cube fontSize14 marginLeft05 positionWrapper" style="color: #DCDCDC" ></span>
109109
<span class="listingsDoesNotShipToYouSlash">/</span>

0 commit comments

Comments
 (0)