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

Commit 06c42ac

Browse files
ilxwolfilxwolf
committed
Merge branch 'master' of https://github.com/OpenBazaar/OpenBazaar-Client into wolf1
2 parents ec99f84 + 1d5727e commit 06c42ac

File tree

15 files changed

+157
-161
lines changed

15 files changed

+157
-161
lines changed

‎css/obBase.css‎

Lines changed: 83 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -419,19 +419,12 @@ h6, .h6 {
419419
-webkit-app-region: no-drag;
420420
}
421421

422-
#appBar .title {
423-
/* since the loading spinners are centered in a manner
424-
where chat is excluded from the width, we'll follow
425-
suit here so our title is centered with the spinners */
426-
width: calc(100% - 45px);
427-
}
428-
429422
#pageNav .btn {
430423
-webkit-app-region: no-drag;
431424
}
432425

433426
#pageNav .navBar.bar {
434-
padding: 0 8px 10px;
427+
padding: 0 8px;
435428
}
436429

437430
#pageNav .modal-about .navBar.bar {
@@ -4397,7 +4390,6 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
43974390
top: 0;
43984391
width: 100%;
43994392
height: 100%;
4400-
-webkit-app-region: no-drag;
44014393
pointer-events: none;
44024394
}
44034395
@@ -4433,7 +4425,6 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
44334425
left: 0;
44344426
top: 50%;
44354427
margin-top: 117px;
4436-
margin-left: -40px;
44374428
opacity: 1;
44384429
transition: opacity 1s 5s ease;
44394430
box-sizing: border-box;
@@ -6145,18 +6136,18 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
61456136

61466137
/* turn off animations and transitions with this style */
61476138

6148-
#ov1.notFancy,
6149-
#ov1.notFancy *,
6150-
#ov1.notFancy #userPage,
6151-
#ov1.notFancy #userPage *,
6152-
#ov1.notFancy #obContainer,
6153-
#ov1.notFancy #obContainer *,
6154-
#ov1.notFancy #overlay,
6155-
#ov1.notFancy #sideBar,
6156-
#ov1.notFancy #pageNav,
6157-
#ov1.notFancy #modalHolder,
6158-
#ov1.notFancy #messageModal,
6159-
#ov1.notFancy #statusBar {
6139+
#ov1.minEffects,
6140+
#ov1.minEffects *,
6141+
#ov1.minEffects #userPage,
6142+
#ov1.minEffects #userPage *,
6143+
#ov1.minEffects #obContainer,
6144+
#ov1.minEffects #obContainer *,
6145+
#ov1.minEffects #overlay,
6146+
#ov1.minEffects #sideBar,
6147+
#ov1.minEffects #pageNav,
6148+
#ov1.minEffects #modalHolder,
6149+
#ov1.minEffects #messageModal,
6150+
#ov1.minEffects #statusBar {
61606151
transition: none !important;
61616152
-webkit-filter: none !important;
61626153
opacity: 1 !important;
@@ -6166,131 +6157,143 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
61666157
text-shadow: none !important;
61676158
}
61686159

6169-
#ov1.notFancy #pageNav .popMenu.popMenu-navBar.popMenu-opened {
6160+
#ov1.minEffects #pageNav .popMenu-navBarSubMenu {
61706161
border-left: 1px solid #444;
61716162
border-right: 1px solid #444;
61726163
border-bottom: 1px solid #444;
61736164
}
61746165

6175-
#ov1.notFancy .fadeOut,
6176-
#ov1.notFancy .statusBar.fadeOut,
6177-
#ov1.notFancy #pageNav .statusBar.fadeOut,
6178-
#ov1.notFancy #userPage .fadeOut,
6179-
#ov1.notFancy #userPage #pageNav .fadeOut,
6180-
#ov1.notFancy #userPage #pageNav .statusBar.fadeOut,
6181-
#ov1.notFancy #userPage #obContainer #content .statusBar.fadeOut {
6166+
#ov1.minEffects .fadeOut,
6167+
#ov1.minEffects .statusBar.fadeOut,
6168+
#ov1.minEffects #pageNav .statusBar.fadeOut,
6169+
#ov1.minEffects #userPage .fadeOut,
6170+
#ov1.minEffects #userPage #pageNav .fadeOut,
6171+
#ov1.minEffects #userPage #pageNav .statusBar.fadeOut,
6172+
#ov1.minEffects #userPage #obContainer #content .statusBar.fadeOut {
61826173
opacity: 0 !important;
61836174
}
61846175

6185-
#ov1.notFancy #sideBar .sideBarSlidShow {
6176+
#ov1.minEffects #sideBar .sideBarSlidShow {
61866177
display: none;
61876178
}
61886179

6189-
#ov1.notFancy #sideBar.sideBarSlid .sideBarSlidShow {
6180+
#ov1.minEffects #sideBar.sideBarSlid .sideBarSlidShow {
61906181
display: block;
61916182
}
61926183

6193-
#ov1.notFancy #sideBar .chatConversation textarea,
6194-
#ov1.notFancy #sideBar .chatConversation textarea::-webkit-input-placeholder,
6195-
#ov1.notFancy #sideBar .chatConversation input,
6196-
#ov1.notFancy #sideBar .chatConversation input::-webkit-input-placeholder {
6184+
#ov1.minEffects #sideBar .chatConversation textarea,
6185+
#ov1.minEffects #sideBar .chatConversation textarea::-webkit-input-placeholder,
6186+
#ov1.minEffects #sideBar .chatConversation input,
6187+
#ov1.minEffects #sideBar .chatConversation input::-webkit-input-placeholder {
61976188
color: #fff;
61986189
}
61996190

6200-
#ov1.notFancy .gridItemControls {
6191+
#ov1.minEffects .gridItemControls {
62016192
display: none;
62026193
}
62036194

6204-
#ov1.notFancy .gridItemControls .btn-gridItemControl:hover,
6205-
#ov1.notFancy .userPage-subViews .gridItem:hover .gridItemControls,
6206-
#ov1.notFancy .homeView .gridItem:hover .gridItemControls {
6195+
#ov1.minEffects .gridItemControls .btn-gridItemControl:hover,
6196+
#ov1.minEffects .userPage-subViews .gridItem:hover .gridItemControls,
6197+
#ov1.minEffects .homeView .gridItem:hover .gridItemControls {
62076198
display: block;
62086199
}
62096200

6210-
#ov1.notFancy .btn .postConfirm {
6201+
#ov1.minEffects .btn .postConfirm {
62116202
display: none;
62126203
}
62136204

6214-
#ov1.notFancy .confirm.btn .preConfirm {
6205+
#ov1.minEffects .confirm.btn .preConfirm {
62156206
display: none;
62166207
}
62176208

6218-
#ov1.notFancy .confirm.btn .postConfirm {
6209+
#ov1.minEffects .confirm.btn .postConfirm {
62196210
display: inline-block;
62206211
}
62216212

6222-
#ov1.notFancy #userPage #obContainer #content .labelWrap.fade {
6213+
#ov1.minEffects #userPage #obContainer #content .labelWrap.fade {
62236214
opacity: 0 !important;
62246215
}
62256216

6226-
#ov1.notFancy #userPage #obContainer #content .labelWrap.fadeIn {
6217+
#ov1.minEffects #userPage #obContainer #content .labelWrap.fadeIn {
62276218
opacity: 1;
62286219
}
62296220

6230-
#ov1.notFancy #obContainer .taggle_placeholder,
6231-
#ov1.notFancy #userPage #obContainer .taggle_placeholder {
6221+
#ov1.minEffects #obContainer .taggle_placeholder,
6222+
#ov1.minEffects #userPage #obContainer .taggle_placeholder {
62326223
display: none !important;
62336224
}
62346225

6235-
#ov1.notFancy #obContainer .unfilled,
6236-
#ov1.notFancy #userPage .unfilled {
6226+
#ov1.minEffects #obContainer .unfilled,
6227+
#ov1.minEffects #userPage .unfilled {
62376228
opacity: 0.35 !important;
62386229
}
62396230

6240-
#ov1.notFancy .notFancyDarkBackground,
6241-
#ov1.notFancy #obContainer .notFancyDarkBackground {
6231+
#ov1.minEffects .minEffectsDarkBackground,
6232+
#ov1.minEffects #obContainer .minEffectsDarkBackground {
62426233
background: #262626 !important;
62436234
}
62446235

6245-
#ov1.notFancy .addressFormOpened .buyWizardMap .blurMore {
6236+
#ov1.minEffects .addressFormOpened .buyWizardMap .blurMore {
6237+
display: none;
6238+
}
6239+
6240+
#ov1.minEffects .user-page-header-slim {
62466241
display: none;
62476242
}
62486243

6249-
#ov1.notFancy .disabled,
6250-
#ov1.notFancy #userPage .disabled,
6251-
#ov1.notFancy #obContainer .disabled,
6252-
#ov1.notFancy #overlay .disabled,
6253-
#ov1.notFancy #sideBar .disabled,
6254-
#ov1.notFancy #pageNav .disabled,
6255-
#ov1.notFancy #modalHolder .disabled,
6256-
#ov1.notFancy #messageModal .disabled,
6257-
#ov1.notFancy #statusBar .disabled {
6244+
#ov1.minEffects .user-page-header-slim.scrolledIntoView {
6245+
display: block;
6246+
}
6247+
6248+
#ov1.minEffects .disabled,
6249+
#ov1.minEffects #userPage .disabled,
6250+
#ov1.minEffects #obContainer .disabled,
6251+
#ov1.minEffects #overlay .disabled,
6252+
#ov1.minEffects #sideBar .disabled,
6253+
#ov1.minEffects #pageNav .disabled,
6254+
#ov1.minEffects #modalHolder .disabled,
6255+
#ov1.minEffects #messageModal .disabled,
6256+
#ov1.minEffects #statusBar .disabled {
62586257
opacity: 0.2 !important;
62596258
}
62606259

6261-
#ov1.notFancy .disabled2,
6262-
#ov1.notFancy #userPage .disabled2,
6263-
#ov1.notFancy #obContainer .disabled2,
6264-
#ov1.notFancy #overlay .disabled2,
6265-
#ov1.notFancy #sideBar .disabled2,
6266-
#ov1.notFancy #pageNav .disabled2,
6267-
#ov1.notFancy #modalHolder .disabled2,
6268-
#ov1.notFancy #messageModal .disabled2,
6269-
#ov1.notFancy #statusBar .disabled2 {
6260+
#ov1.minEffects .disabled2,
6261+
#ov1.minEffects #userPage .disabled2,
6262+
#ov1.minEffects #obContainer .disabled2,
6263+
#ov1.minEffects #overlay .disabled2,
6264+
#ov1.minEffects #sideBar .disabled2,
6265+
#ov1.minEffects #pageNav .disabled2,
6266+
#ov1.minEffects #modalHolder .disabled2,
6267+
#ov1.minEffects #messageModal .disabled2,
6268+
#ov1.minEffects #statusBar .disabled2 {
62706269
opacity: 0.7 !important;
62716270
}
62726271

6272+
#ov1.minEffects .nsfw {
6273+
background: #000 !important;
6274+
}
6275+
62736276
/* add a shadow and a glow, so modal close buttons are still barely visible if the user picks a bad color */
62746277
#ov1 .js-closeIndexModal [class *= "ion-"]:before,
62756278
#ov1 #userPage .js-closeIndexModal [class *= "ion-"]:before,
62766279
#ov1 #obContainer .js-closeIndexModal [class *= "ion-"]:before,
62776280
#ov1 #modalHolder .js-closeIndexModal [class *= "ion-"]:before,
62786281
#ov1 #messageModal .js-closeIndexModal [class *= "ion-"]:before,
6279-
#ov1.notFancy .js-closeIndexModal [class *= "ion-"]:before,
6280-
#ov1.notFancy #userPage .js-closeIndexModal [class *= "ion-"]:before,
6281-
#ov1.notFancy #obContainer .js-closeIndexModal [class *= "ion-"]:before,
6282-
#ov1.notFancy #modalHolder .js-closeIndexModal [class *= "ion-"]:before,
6283-
#ov1.notFancy #messageModal .js-closeIndexModal [class *= "ion-"]:before,
6282+
#ov1.minEffects .js-closeIndexModal [class *= "ion-"]:before,
6283+
#ov1.minEffects #userPage .js-closeIndexModal [class *= "ion-"]:before,
6284+
#ov1.minEffects #obContainer .js-closeIndexModal [class *= "ion-"]:before,
6285+
#ov1.minEffects #modalHolder .js-closeIndexModal [class *= "ion-"]:before,
6286+
#ov1.minEffects #messageModal .js-closeIndexModal [class *= "ion-"]:before,
62846287
#ov1 .js-modal-close [class *= "ion-"]:before,
62856288
#ov1 #userPage .js-modal-close [class *= "ion-"]:before,
62866289
#ov1 #obContainer .js-modal-close [class *= "ion-"]:before,
62876290
#ov1 #modalHolder .js-modal-close [class *= "ion-"]:before,
62886291
#ov1 #messageModal .js-modal-close [class *= "ion-"]:before,
6289-
#ov1.notFancy .js-modal-close [class *= "ion-"]:before,
6290-
#ov1.notFancy #userPage .js-modal-close [class *= "ion-"]:before,
6291-
#ov1.notFancy #obContainer .js-modal-close [class *= "ion-"]:before,
6292-
#ov1.notFancy #modalHolder .js-modal-close [class *= "ion-"]:before,
6293-
#ov1.notFancy #messageModal .js-modal-close [class *= "ion-"]:before,
6292+
#ov1.minEffects .js-modal-close [class *= "ion-"]:before,
6293+
#ov1.minEffects #userPage .js-modal-close [class *= "ion-"]:before,
6294+
#ov1.minEffects #obContainer .js-modal-close [class *= "ion-"]:before,
6295+
#ov1.minEffects #modalHolder .js-modal-close [class *= "ion-"]:before,
6296+
#ov1.minEffects #messageModal .js-modal-close [class *= "ion-"]:before,
62946297
#ov1 #modalHolder .js-closeBuyWizardModal [class *= "ion-"]:before {
62956298
text-shadow: 0 0 1px rgba(0,0,0,1), 0 0 2px rgba(255,255,255, 1) !important;
62966299
}

‎js/collections/ratingCl.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ module.exports = Backbone.Collection.extend({
1717
return [];
1818
}
1919

20-
return response;
20+
return response.reverse();
2121
}
2222
});

‎js/languages/en-US.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -548,6 +548,7 @@
548548
"pageUnavailable": "This page is currently unavailable.",
549549
"badHandle": "The handle you entered does not have a valid OpenBazaar ID.",
550550
"serverDown": "The server has been shut down",
551+
"unableToLoadImages": "We were unable to load your image(s).",
551552
"tooManyPhotosTitle": "Too many photos",
552553
"tooManyPhotosBody": "Some or all of your photos were prevented from being uploaded because you would exceeded the maximum allowable amount.",
553554
"badJSON": "The JSON data returned from the server was malformed",

‎js/router.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -444,8 +444,6 @@ module.exports = Backbone.Router.extend({
444444
},
445445

446446
settings: function(state){
447-
$('.js-loadingModal').addClass('show');
448-
449447
this.newView(settingsView, {
450448
viewArgs: {
451449
userModel: this.userModel,

‎js/start.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,8 @@ $(window).bind('hashchange', function(){
256256
});
257257

258258
//set fancy styles class
259-
if (localStorage.getItem('notFancy') == "true"){
260-
$html.addClass('notFancy');
259+
if (localStorage.getItem('minEffects') == "true"){
260+
$html.addClass('minEffects');
261261
}
262262

263263
//prevent dragging a file to the window from loading that file

‎js/templates/itemEdit.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,28 +20,28 @@
2020
<div class="flexRow custCol-secondary border0 height50">
2121
<label for="itemImageUploadMain" class="fieldItem width100">
2222
<h5 class="floatLeft"><%= polyglot.t('Photos') %></h5>
23-
<span class="btn btn-c1 btn-txt rowTop20 pull-right custCol-primary textOpacity1 margin0 marginTopNeg8 <%= ob.combinedImagesArray.length >= ob.MAX_PHOTOS ? 'disabled' : '' %>">
23+
<span class="btn btn-c1 btn-txt rowTop20 pull-right custCol-primary textOpacity1 margin0 marginTopNeg8 <%= ob.images.length >= ob.MAX_PHOTOS ? 'disabled' : '' %>">
2424
<span class="ion-images fontSize11 marginRight2 textOpacity75"></span>
2525
<%= polyglot.t('SelectPhotos') %>
2626
</span>
27-
<input type="file" name="image" id="itemImageUploadMain" accept="image/*" class="hide js-itemImageUpload" multiple <%= ob.combinedImagesArray.length >= ob.MAX_PHOTOS ? 'disabled' : '' %>>
27+
<input type="file" name="image" id="itemImageUploadMain" accept="image/*" class="hide js-itemImageUpload" multiple <%= ob.images.length >= ob.MAX_PHOTOS ? 'disabled' : '' %>>
2828
</label>
2929
</div>
3030
<div class="flexRow js-editItemSubImagesWrapper editItemImageHolder">
3131
<div class="statusBar navBar fadeOut positionAbsolute js-itemEditImageLoading">
3232
<div class="pad20 rowTop20 width100"><h4 class="txt-center"><%= polyglot.t('LoadingImage') %></h4></div>
3333
</div>
3434
<div class="js-subImageWrap">
35-
<% _.each(ob.combinedImagesArray, function(data, i) { %>
36-
<div class="itemImg itemImg-small js-dropImage js-editItemSubImage floatLeft" style="background-image: url(<%= data %>);">
35+
<% _.each(ob.images, function(url, i) { %>
36+
<div class="itemImg itemImg-small js-dropImage js-editItemSubImage floatLeft" style="background-image: url(<%= url %>);">
3737
<div class="btn btn-corner btn-cornerTR btn-cornerTRSmall btn-flushTop btn-c1 fade btn-shadow1 js-editItemDeleteImage">
3838
<i class="ion-android-close icon-centered icon-small"></i>
3939
</div>
4040
</div>
4141
<% }); %>
4242
</div>
4343
</div>
44-
<label for="itemImageUploadMain" class="textSize14px editItemImageLoadPhotoMessage js-itemEditLoadPhotoMessage <%= ob.combinedImagesArray.length ? 'hide' : '' %>">
44+
<label for="itemImageUploadMain" class="textSize14px editItemImageLoadPhotoMessage js-itemEditLoadPhotoMessage <%= ob.images.length ? 'hide' : '' %>">
4545
<span class="fullCentered"><%= polyglot.t('NoPhotosAdded') %></span>
4646
</label>
4747
<!--<div class="textOpacity50">Drag photos here or click button above.</div>-->

‎js/templates/settings.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1181,9 +1181,9 @@ <h3 class="padding15 margin0 fontWeight500"><%= polyglot.t('Advanced') %></h3>
11811181
<div class="fieldItem flexRow">
11821182
<div class="flexRow">
11831183
<div class="flexCol-4">
1184-
<input type="radio" class="fieldItem" id="fancyStylesYes" name="notFancy" value="true" />
1184+
<input type="radio" class="fieldItem" id="fancyStylesYes" name="minEffects" value="true" />
11851185
<label for="fancyStylesYes" class="radioLabel"><%= polyglot.t('Yes') %></label>
1186-
<input type="radio" class="fieldItem" id="fancyStylesNo" name="notFancy" value="false" checked/>
1186+
<input type="radio" class="fieldItem" id="fancyStylesNo" name="minEffects" value="false" checked/>
11871187
<label for="fancyStylesNo" class="radioLabel"><%= polyglot.t('No') %></label>
11881188
</div>
11891189
<div class="flexCol-8">

‎js/templates/transactionModal.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ <h2 class="ion-android-close clickable"></h2>
66
<% if(ob.invalidData){ %>
77
<div class="fullCentered"><h2><%= polyglot.t('errorMessages.serverError') %></h2></div>
88
<% } else { %>
9-
<div class="modal-hero js-transactionHero shadow-inner1-light overflowHidden"
9+
<div class="modal-hero js-transactionHero shadow-inner1-light"
1010
<% if(ob.vendor_offer.listing.item.image_hashes){ %>
1111
style="background-image: url(<%= ob.serverUrl %>get_image?hash=<%= ob.vendor_offer.listing.item.image_hashes[0] %>&guid=<%=ob.vendor_offer.listing.id.guid %>), url(imgs/defaultBanner.png);"
1212
<% } else { %>
@@ -18,7 +18,7 @@ <h2 class="ion-android-close clickable"></h2>
1818
<h3 class="txt-bright"><%= polyglot.t('CheckExchanges') %> </h3>
1919
</div>
2020
</div>
21-
<div class="colorWhiteForce positionBottom width100 padding12 notFancyDarkBackground">
21+
<div class="colorWhiteForce positionBottom width100 padding12 minEffectsDarkBackground">
2222
<div class="fontSize16">Order #<%- ob.orderID %></div>
2323
<div class="fontSize14 textOpacity75 marginTop2">
2424
<%= polyglot.t('transactions.OrderStatus'+ob.status) %>

‎js/templates/userPage.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ <h1 class="page-userNameLarge floatLeft fancy-heading fontSize20 colorWhiteForce
6262
</div>
6363

6464
<div class="shadow-inner1 user-page-header js-userPageHeader">
65-
<div class="rowItem positionBottom width100 padding0 paddingLeft20 notFancyDarkBackground">
65+
<div class="rowItem positionBottom width100 padding0 paddingLeft20 minEffectsDarkBackground">
6666
<div class="table">
6767
<div>
6868
<div class="thumbnail thumbnail-large js-userPageAvatar"

‎js/views/homeVw.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,8 +527,9 @@ module.exports = pageVw.extend({
527527

528528
//clear address bar
529529
window.obEventBus.trigger("setAddressBar", {'addressText': ""});
530-
530+
531531
this.$el.find('.js-discoverHeading').html(window.polyglot.t('Discover'));
532+
this.$el.find('.js-homeListingToggle').removeClass('hide');
532533

533534
// change loading text copy
534535
this.$el.find('.js-loadingText').html(this.$el.find('.js-loadingText').data('defaultText'));

0 commit comments

Comments
 (0)