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

Commit 90b97f0

Browse files
jjeffryesjjeffryes
committed
Merge remote-tracking branch 'refs/remotes/origin/master' into pr/1522
2 parents 2aab590 + 2aa97b7 commit 90b97f0

File tree

15 files changed

+369
-191
lines changed

15 files changed

+369
-191
lines changed

‎css/obBase.css‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1056,7 +1056,7 @@ label.fieldItem {
10561056
top: 0;
10571057
left: 0;
10581058
right: 0;
1059-
z-index: 7;
1059+
z-index: 1;
10601060
}
10611061

10621062
.modal-child {
@@ -4010,6 +4010,13 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
40104010
transition: width .35s cubic-bezier(0, 0, 0.2, 1);
40114011
}
40124012
4013+
.customizePrimaryColorRecommendations.show,
4014+
.customizeSecondaryColorRecommendations.show,
4015+
.customizeBackgroundColorRecommendations.show,
4016+
.customizeTextColorRecommendations.show {
4017+
width: 273px;
4018+
}
4019+
40134020
.customColorChoice {
40144021
background: #fff;
40154022
display: inline-block;
@@ -5746,9 +5753,6 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
57465753
width: 260px;
57475754
}
57485755

5749-
#ov1 .width270 {
5750-
width: 270px;
5751-
}
57525756
#ov1 .width380 {
57535757
width: 380px;
57545758
}

‎index.html‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@ <h2 class="ion-android-close custCol-text clickable"></h2>
6161
<script src="js/utils/list.min.js"></script>
6262

6363
<script>
64-
var app = require('./js/start'),
65-
remote = require('remote');
64+
var app = require('./js/start');
6665

6766
window.translateIndex = function(){
6867
$('.js-translate').each(function() {

‎js/languages/en-US.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@
332332
"LoadingBitcoinPrices": "Loading Bitcoin Prices...",
333333
"ThisUserIsBlocked": "This user is hidden because they are on your blocked list",
334334
"ThisUserIsNSFW": "This user is hidden because their page is listed as NSFW",
335-
"ShowBlockedUser": "Show this user's page except for NSFW listings",
335+
"ShowBlockedUser": "Show this user's page.",
336336
"ShowNSFWContent": "Show this user's page, and all NSFW listings",
337337
"NoShipping": "Digital or Remote (No Shipping)",
338338
"WorldwideShipping": "Worldwide",
@@ -1696,7 +1696,7 @@
16961696
"currency": "Bolivar"
16971697
},
16981698
"VIETNAM": {
1699-
"name": "VietNam",
1699+
"name": "Vietnam",
17001700
"currency": "Dong"
17011701
},
17021702
"VIRGIN_ISLANDS_BRITISH": {

‎js/start.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,11 @@ user.on('change:language', function(md, lang) {
8989
window.translateIndex();
9090
});
9191

92+
window.addEventListener('contextmenu', (e) => {
93+
e.preventDefault();
94+
ipcRenderer.send('contextmenu-click', e);
95+
}, false);
96+
9297
app.serverConfigs = new ServerConfigsCl();
9398
app.serverConfigs.fetch().done(() => {
9499
var oldConfig,

‎js/templates/item.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ <h4><%= polyglot.t('CanBeShippedTo') %></h4>
154154
<span class="ion-android-list fontSize12 marginRight2 textOpacity1"></span>
155155
<%= polyglot.t('Description') %>
156156
</a>
157-
<a class="btn btn-bar btn-tab custCol-secondary js-reviewsTab js-tab paddingRight18 <% ob.activeTab === 'reviews' && print('active') %>">
157+
<a class="btn btn-bar btn-tab custCol-secondary js-itemReviewsTab js-tab paddingRight18 <% ob.activeTab === 'itemReviews' && print('active') %>">
158158
<span class="ion-android-star fontSize11 marginRight2 textOpacity1"></span>
159159
<%= polyglot.t('Reviews') %>
160160
<% if (!ob.fetchingRatings) { %>
@@ -173,7 +173,7 @@ <h4><%= polyglot.t('CanBeShippedTo') %></h4>
173173
</div>
174174
</div>
175175
</div>
176-
<div class="flexContainer flex-border custCol-primary minHeight300 textOpacity75 js-reviews js-tabTarg <% ob.activeTab !== 'reviews' && print('hide') %>">
176+
<div class="flexContainer flex-border custCol-primary minHeight300 textOpacity75 js-itemReviews js-tabTarg <% ob.activeTab !== 'itemReviews' && print('hide') %>">
177177
<% if (ob.fetchingRatings) { %>
178178
<div class="padding20 marginBottom12 width100 alignCenter">
179179
<div class="spinnerWrapper">

‎js/templates/review.html‎

Lines changed: 47 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,58 @@
1-
<div class="rowItem padding2015">
1+
<div class="rowItem padding2015 marginLeft15">
22
<div class="table custCol-text">
33
<div>
4-
<div class="marginLeft15 marginTop2">
5-
<div class="marginLeft15 marginTop2">
6-
</div>
7-
<div class="marginLeft15 marginTop2">
8-
<div class="clearfix">
9-
<div class="pull-left">
10-
<% print(ob.starsTmpl({ rating: ob.feedback })) %>
11-
(<%= ob.feedback %>/5)
12-
</div>
13-
<% if(ob.address){ %>
14-
<div class="pull-right">
15-
<% if(config.testnet){ %>
16-
<a href="https://live.blockcypher.com/btc-testnet/address/<%- ob.address %>" class="noWrap">
17-
<% }else{ %>
18-
<a href="https://live.blockcypher.com/btc/address/<%- ob.address %>" class="noWrap">
19-
<% } %>
20-
<div class="btn btn-txt floatRight custCol-secondary textOpacity1">
21-
<%= polyglot.t('transactions.ViewOnBlockchain') %>
22-
<span class="ion-android-open fontSize10"></span>
23-
</div>
24-
</a>
25-
</div>
4+
<div class="marginTop2">
5+
<div class="clearfix">
6+
<div class="pull-left">
7+
<% print(ob.starsTmpl({ rating: ob.feedback })) %>
8+
(<%= ob.feedback %>/5)
9+
</div>
10+
<% if(ob.address){ %>
11+
<div class="pull-right">
12+
<% if(config.testnet){ %>
13+
<a href="https://live.blockcypher.com/btc-testnet/address/<%- ob.address %>" class="noWrap">
14+
<% }else{ %>
15+
<a href="https://live.blockcypher.com/btc/address/<%- ob.address %>" class="noWrap btn btn-txt floatRight custCol-secondary textOpacity1">
2616
<% } %>
17+
<%= polyglot.t('transactions.ViewOnBlockchain') %>
18+
<span class="ion-android-open fontSize10"></span>
19+
</a>
2720
</div>
28-
<p class="fontSize14 textWeightNormal clamp4 marginTop9"><%= ob.review %></p>
21+
<% } %>
2922
</div>
23+
<p class="fontSize14 textWeightNormal clamp4 marginTop9"><%= ob.review %></p>
24+
</div>
25+
<div style="width: 45px">
26+
<!--gutter between cells -->
3027
</div>
31-
<div class="marginLeft15 pull-right">
32-
<div class="floatLeft marginRight15" style="width: 200px">
33-
<div class="fontSize14">
34-
<div><%= polyglot.t('transactions.Quality') %> (<%= ob.quality %>/5)</div>
35-
<div>
36-
<% print(ob.starsTmpl({ rating: ob.quality })) %>
37-
</div>
38-
</div>
39-
<div class="fontSize14 marginTop9">
40-
<div><%= polyglot.t('transactions.MatchedDescription') %> (<%= ob.description %>/5)</div>
41-
<div>
42-
<% print(ob.starsTmpl({ rating: ob.description })) %>
43-
</div>
28+
<div>
29+
<div class="floatLeft marginRight15 fontSize14" style="width: 200px">
30+
<div>
31+
<%= polyglot.t('transactions.Quality') %> (<%= ob.quality %>/5)
32+
</div>
33+
<div>
34+
<% print(ob.starsTmpl({ rating: ob.quality })) %>
35+
</div>
36+
<div class="marginTop9">
37+
<%= polyglot.t('transactions.MatchedDescription') %> (<%= ob.description %>/5)
38+
</div>
39+
<div>
40+
<% print(ob.starsTmpl({ rating: ob.description })) %>
4441
</div>
4542
</div>
46-
<div class="floatLeft" style="width: 200px">
47-
<div class="fontSize14">
48-
<div><%= polyglot.t('transactions.DeliverySpeed') %> (<%= ob.delivery_time %>/5)</div>
49-
<div>
50-
<% print(ob.starsTmpl({ rating: ob.delivery_time })) %>
51-
</div>
52-
</div>
53-
<div class="fontSize14 marginTop9">
54-
<div><%= polyglot.t('transactions.CustomerService') %> (<%= ob.customer_service %>/5)</div>
55-
<div>
56-
<% print(ob.starsTmpl({ rating: ob.customer_service })) %>
57-
</div>
58-
</div>
43+
<div class="floatLeft fontSize14" style="width: 200px">
44+
<div>
45+
<%= polyglot.t('transactions.DeliverySpeed') %> (<%= ob.delivery_time %>/5)
46+
</div>
47+
<div>
48+
<% print(ob.starsTmpl({ rating: ob.delivery_time })) %>
49+
</div>
50+
<div class="marginTop9">
51+
<%= polyglot.t('transactions.CustomerService') %> (<%= ob.customer_service %>/5)
52+
</div>
53+
<div>
54+
<% print(ob.starsTmpl({ rating: ob.customer_service })) %>
55+
</div>
5956
</div>
6057
</div>
6158
</div>

‎js/templates/userPage.html‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,13 @@ <h1 class="page-userNameLarge floatLeft fancy-heading fontSize20 colorWhiteForce
258258
<span class="pill fontSize12 textOpacity75 marginLeft2 js-userFollowerCount">...</span>
259259
</a>
260260
<% if(ob.page.profile.vendor) { %>
261+
<a class="btn btn-bar btn-tab custCol-secondary js-reviewsTab js-tab paddingRight18">
262+
<span class="ion-android-star fontSize11 marginRight2 textOpacity1"></span>
263+
<%= polyglot.t('Reviews') %>
264+
<span class="pill fontSize12 textOpacity75 marginLeft2 js-userReviewsCount">...</span>
265+
</a>
266+
<% } %>
267+
<% if(ob.page.profile.vendor) { %>
261268
<a class="btn btn-bar btn-tab custCol-secondary js-storeTab js-tab paddingRight18">
262269
<span class="ion-ios-cart fontSize11 marginRight2 textOpacity1"></span>
263270
<%= polyglot.t('Store') %>
@@ -428,6 +435,13 @@ <h1 class="page-userNameLarge floatLeft fancy-heading fontSize20 colorWhiteForce
428435
</div>
429436
</div>
430437
</div>
438+
<div class="flexContainer flex-border custCol-primary js-reviews js-tabTarg hide minHeight650">
439+
<div class="flexRow js-list6">
440+
<div class="padding10 width100 alignCenter js-loadingMsg borderBottom">
441+
<i class="ion-android-sync spinner textSize24px textOpacity50"></i>
442+
</div>
443+
</div>
444+
</div>
431445
<div class="flexContainer flex-border custCol-primary js-followers js-tabTarg hide minHeight650" id="searchFollowers">
432446
<div class="flexRow height54">
433447
<!--<div class="txtFieldWrapper searchWrapper searchWrapperWithPill borderBottom custCol-border">-->

‎js/views/buyDetailsVw.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ module.exports = Backbone.View.extend({
122122
lockForm: function(){
123123
"use strict";
124124
this.$('.js-buyWizardQuantity').prop('disabled', true);
125-
this.$('#buyWizardQuantity .numberSpinnerUp, #buyWizardQuantity .numberSpinnerDown').addClass('hide');
125+
this.$('#buyWizardQuantity').find('.numberSpinnerUp,.numberSpinnerDown').addClass('hide');
126126
},
127127

128128
goToPurchases: function(){

‎js/views/itemVw.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ module.exports = baseVw.extend({
1515

1616
events: {
1717
'click .js-descriptionTab': 'descriptionClick',
18-
'click .js-reviewsTab': 'reviewsClick',
18+
'click .js-itemReviewsTab': 'reviewsClick',
1919
'click .js-shippingTab': 'shippingClick',
2020
'click .js-buyButton': 'buyClick',
2121
'click .js-photoGallery': 'photoGalleryClick',
@@ -155,7 +155,7 @@ module.exports = baseVw.extend({
155155
},
156156

157157
reviewsClick: function(e){
158-
this.setTab('reviews');
158+
this.setTab('itemReviews');
159159
},
160160

161161
shippingClick: function(e){
@@ -184,7 +184,7 @@ module.exports = baseVw.extend({
184184
},
185185

186186
clickItemRating: function(e) {
187-
this.setTab('reviews');
187+
this.setTab('itemReviews');
188188
$('#obContainer').animate({
189189
scrollTop: this.$('.js-reviewsContainer').offset().top
190190
}, 200);

‎js/views/onboardingModal.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ module.exports = baseModal.extend({
389389
avatarUpload.resolve();
390390
}
391391

392-
this.$('.js-followHandles [data-handle]:checked').each(function(e) {
392+
this.$('.js-followHandles').find('[data-handle]:checked').each(function(e) {
393393
followHandles.push($(this).data('handle'));
394394
});
395395

0 commit comments

Comments
 (0)