From 7b0f88a6caad5b604ad5708a33e4f9ffaa0bbd2b Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 8 May 2018 17:32:56 +0200 Subject: fitfooter placement --- .../ios/Stone Island.xcarchive/Info.plist | 2 +- .../Applications/Stone Island.app/Assets.car | Bin 844136 -> 844136 bytes .../01J-lp-oVM-view-Ze5-6b-2t3.nib | Bin 2284 -> 2285 bytes .../UIViewController-01J-lp-oVM.nib | Bin 832 -> 832 bytes .../Stone Island.app/MainViewController.nib | Bin 943 -> 943 bytes .../Applications/Stone Island.app/Stone Island | Bin 2224192 -> 2224192 bytes .../Stone Island.app/_CodeSignature/CodeResources | 42 ++++++++++----------- .../Stone Island.app/www/css/products.css | 2 +- .../Applications/Stone Island.app/www/index.html | 3 +- .../www/js/lib/products/ProductView.js | 27 ++++++++----- StoneIsland/platforms/ios/www/css/products.css | 2 +- StoneIsland/platforms/ios/www/index.html | 3 +- .../ios/www/js/lib/products/ProductView.js | 27 ++++++++----- StoneIsland/www/css/products.css | 2 +- StoneIsland/www/index.html | 3 +- 15 files changed, 62 insertions(+), 51 deletions(-) diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist b/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist index 5460d650..8a5838ca 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist @@ -18,7 +18,7 @@ ArchiveVersion 2 CreationDate - 2018-05-02T23:35:04Z + 2018-05-08T15:30:48Z Name Stone Island SchemeName diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Assets.car b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Assets.car index 063effce..b7b16be5 100644 Binary files a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Assets.car and b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Assets.car differ diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib index cec81528..3fd83cc9 100644 Binary files a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib and b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib differ diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib index 9006bed3..8bf77835 100644 Binary files a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib and b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib differ diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib index e9d76e1a..4089b095 100644 Binary files a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib and b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib differ diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Stone Island b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Stone Island index 2821a285..0faa9935 100755 Binary files a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Stone Island and b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Stone Island differ diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/_CodeSignature/CodeResources b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/_CodeSignature/CodeResources index 8cca0b7c..699c247a 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/_CodeSignature/CodeResources +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/_CodeSignature/CodeResources @@ -94,11 +94,11 @@ Assets.car - Xrihp0M9X5FmIxaeGZ7doxdqeog= + GKP5ELVZRAReX7Y+C0G4yaxO6Kk= CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib - rnvajEbR2pLpwNzVRqmW0PEDN8g= + fOTgbUJk54yRmkWcTCFT7+wmKjU= CDVLaunchScreen.storyboardc/Info.plist @@ -106,7 +106,7 @@ CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib - o1OB+DkYiMTzF/2l2gcJ2D9omTU= + 2ttmDwLkZmOQZJm81hHhfHMJTBw= CDVNotification.bundle/beep.wav @@ -118,7 +118,7 @@ MainViewController.nib - VYjIHyUqgNvmk53zW/2nAsOGB3c= + HZ5DMDECsAU+S/qRs69uof0bGOw= PkgInfo @@ -230,7 +230,7 @@ www/css/products.css - 59uS6OlN1+LRQeumWcnpGy+UMq4= + TD/pdJU85wY38D+A8Mx72erBnhU= www/css/vendor/flickity.css @@ -350,7 +350,7 @@ www/index.html - q6oQx9+nrmqcNgsMMC5PFihzJ0I= + uQggcZ+EBKrDc4oQ0KwUNEvQde4= www/js/index.js @@ -510,7 +510,7 @@ www/js/lib/products/ProductView.js - frSEcy+Zr4wvorsFDcwd4HmSwKg= + n2nL3c4JKuvvbphytqgMxrIUvwQ= www/js/lib/products/Selector.js @@ -941,22 +941,22 @@ hash - Xrihp0M9X5FmIxaeGZ7doxdqeog= + GKP5ELVZRAReX7Y+C0G4yaxO6Kk= hash2 - ent7jBUfpB8OOozrJnYqASnJDjAiXiHBel4IxJTvGcw= + yqlk5wIVvuYcfWsc2ptvccPo4BlkcLNAwm7y1mlpwDc= CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib hash - rnvajEbR2pLpwNzVRqmW0PEDN8g= + fOTgbUJk54yRmkWcTCFT7+wmKjU= hash2 - 12OlYGTq9Iwmv1q6yHlb0pxKff6p4W3+/R86h7+bzYI= + 0Eha3DYx0sAhLInrB1lubAuKAPMw5k6YaIqJYZIYXxg= CDVLaunchScreen.storyboardc/Info.plist @@ -974,11 +974,11 @@ hash - o1OB+DkYiMTzF/2l2gcJ2D9omTU= + 2ttmDwLkZmOQZJm81hHhfHMJTBw= hash2 - IuuDf3x/6SimMFXOPDgCSlRek9kKiJPwTdvoEFeyoqE= + hcbgM16lH6WLo1zlYhPN5Qo21wTTl5uR63kAbNvLiPQ= CDVNotification.bundle/beep.wav @@ -996,11 +996,11 @@ hash - VYjIHyUqgNvmk53zW/2nAsOGB3c= + HZ5DMDECsAU+S/qRs69uof0bGOw= hash2 - Y28WiTZEW77UszY6g73dz1lmNkB2bJluQEfYMFOJohc= + mR0ZMA3Uffd25oLklAZIOryyJv3p2HhspURsuhrkXK4= config.xml @@ -1293,11 +1293,11 @@ hash - 59uS6OlN1+LRQeumWcnpGy+UMq4= + TD/pdJU85wY38D+A8Mx72erBnhU= hash2 - htRbkoM3G54WXqwhHcYsXQofeIPxdRAPy/LMAE3BEYc= + JJ6qUTuBPDSEavv3UwLVQaPAc439qtgrpAbKz48o3iE= www/css/vendor/flickity.css @@ -1623,11 +1623,11 @@ hash - q6oQx9+nrmqcNgsMMC5PFihzJ0I= + uQggcZ+EBKrDc4oQ0KwUNEvQde4= hash2 - T1lBQ5kMTH0sk+snXx27xEGc0L1FA09vfLrUHZDWfF0= + ncVW/WzNr3I6IRlkX+5Q/Xci21RPsBWnw8WIuql6G4o= www/js/index.js @@ -2063,11 +2063,11 @@ hash - frSEcy+Zr4wvorsFDcwd4HmSwKg= + n2nL3c4JKuvvbphytqgMxrIUvwQ= hash2 - PiTxNyCf6dI/7ObaS9jhiuOKZ1fMUP+JHRulVpafzrI= + 7iJuUgBMAyWIjtX3XCsW00JkOrBJZImKfSeW30aa5Mc= www/js/lib/products/Selector.js diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/products.css b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/products.css index bc5dc29b..d78801f8 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/products.css +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/products.css @@ -222,7 +222,7 @@ letter-spacing:0.5px; text-decoration: none; text-transform:uppercase; - padding:0px 0 0; + padding: 12px 0 0; } #product .gallery-prev, diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/index.html b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/index.html index d5d706c1..9221d0be 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/index.html +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/index.html @@ -278,6 +278,7 @@
Fits Large
+
Not Available In Canada
@@ -286,8 +287,6 @@

We suggest you choose a smaller size than yours. -
-
diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/products/ProductView.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/products/ProductView.js index 536b4dad..7d782273 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/products/ProductView.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/products/ProductView.js @@ -203,22 +203,29 @@ var ProductView = ScrollableView.extend({ this.$productHeader.toggleClass("wide", title.length > 48) - var fits_large = !!(this.fitLargeCodes[this.code] && app.store.fitsLarge === 'true') - app.product.$fit.toggle( fits_large ) - app.product.$sizing.toggle( fits_large ) + var fits_large = !!(this.fitLargeCodes[this.code]) this.showFooter() console.log(app.store.FitsLarge, app.store.fitsLargeText) - if (app.store.FitsLarge === 'use_alt_text' && (app.store.FitsLargeText || "").length) { - var fit_lines = app.store.FitsLargeText.replace(//g, "&rt;").split('\n').join("
") - $('.fitFooter').html(fit_lines) - $('.fitFooter').show() - } - else { + if (fits_large) { + if (app.store.FitsLarge === 'use_alt_text' && (app.store.FitsLargeText || "").length) { + var fit_lines = app.store.FitsLargeText.replace(//g, "&rt;").split('\n').join("
") + $('.fitFooter').html(fit_lines) + $('.fitFooter').show() + app.product.$fit.hide() + app.product.$sizing.hide() + } + else { + app.product.$fit.show() + app.product.$sizing.show() + $('.fitFooter').hide() + } + } else { + app.product.$fit.hide() + app.product.$sizing.hide() $('.fitFooter').hide() } - this.deferScrollToTop() }, diff --git a/StoneIsland/platforms/ios/www/css/products.css b/StoneIsland/platforms/ios/www/css/products.css index bc5dc29b..d78801f8 100755 --- a/StoneIsland/platforms/ios/www/css/products.css +++ b/StoneIsland/platforms/ios/www/css/products.css @@ -222,7 +222,7 @@ letter-spacing:0.5px; text-decoration: none; text-transform:uppercase; - padding:0px 0 0; + padding: 12px 0 0; } #product .gallery-prev, diff --git a/StoneIsland/platforms/ios/www/index.html b/StoneIsland/platforms/ios/www/index.html index d5d706c1..9221d0be 100755 --- a/StoneIsland/platforms/ios/www/index.html +++ b/StoneIsland/platforms/ios/www/index.html @@ -278,6 +278,7 @@
Fits Large
+
Not Available In Canada
@@ -286,8 +287,6 @@

We suggest you choose a smaller size than yours. -
-
diff --git a/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js b/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js index 536b4dad..7d782273 100755 --- a/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js +++ b/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js @@ -203,22 +203,29 @@ var ProductView = ScrollableView.extend({ this.$productHeader.toggleClass("wide", title.length > 48) - var fits_large = !!(this.fitLargeCodes[this.code] && app.store.fitsLarge === 'true') - app.product.$fit.toggle( fits_large ) - app.product.$sizing.toggle( fits_large ) + var fits_large = !!(this.fitLargeCodes[this.code]) this.showFooter() console.log(app.store.FitsLarge, app.store.fitsLargeText) - if (app.store.FitsLarge === 'use_alt_text' && (app.store.FitsLargeText || "").length) { - var fit_lines = app.store.FitsLargeText.replace(//g, "&rt;").split('\n').join("
") - $('.fitFooter').html(fit_lines) - $('.fitFooter').show() - } - else { + if (fits_large) { + if (app.store.FitsLarge === 'use_alt_text' && (app.store.FitsLargeText || "").length) { + var fit_lines = app.store.FitsLargeText.replace(//g, "&rt;").split('\n').join("
") + $('.fitFooter').html(fit_lines) + $('.fitFooter').show() + app.product.$fit.hide() + app.product.$sizing.hide() + } + else { + app.product.$fit.show() + app.product.$sizing.show() + $('.fitFooter').hide() + } + } else { + app.product.$fit.hide() + app.product.$sizing.hide() $('.fitFooter').hide() } - this.deferScrollToTop() }, diff --git a/StoneIsland/www/css/products.css b/StoneIsland/www/css/products.css index bc5dc29b..d78801f8 100755 --- a/StoneIsland/www/css/products.css +++ b/StoneIsland/www/css/products.css @@ -222,7 +222,7 @@ letter-spacing:0.5px; text-decoration: none; text-transform:uppercase; - padding:0px 0 0; + padding: 12px 0 0; } #product .gallery-prev, diff --git a/StoneIsland/www/index.html b/StoneIsland/www/index.html index d5d706c1..9221d0be 100755 --- a/StoneIsland/www/index.html +++ b/StoneIsland/www/index.html @@ -278,6 +278,7 @@
Fits Large
+
Not Available In Canada
@@ -286,8 +287,6 @@

We suggest you choose a smaller size than yours. -
-
-- cgit v1.2.3-70-g09d2