diff options
| author | Jules Laplace <julescarbon@gmail.com> | 2018-05-08 17:32:56 +0200 |
|---|---|---|
| committer | Jules Laplace <julescarbon@gmail.com> | 2018-05-08 17:32:56 +0200 |
| commit | 7b0f88a6caad5b604ad5708a33e4f9ffaa0bbd2b (patch) | |
| tree | 5f3371b8aa013895416dd299fe66ba06faa954dc /StoneIsland/platforms/ios | |
| parent | b317357f8b8169b1547dcb10531c326eef0a5815 (diff) | |
fitfooter placement
Diffstat (limited to 'StoneIsland/platforms/ios')
13 files changed, 60 insertions, 48 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 @@ <key>ArchiveVersion</key> <integer>2</integer> <key>CreationDate</key> - <date>2018-05-02T23:35:04Z</date> + <date>2018-05-08T15:30:48Z</date> <key>Name</key> <string>Stone Island</string> <key>SchemeName</key> 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 Binary files differindex 063effce..b7b16be5 100644 --- 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 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 Binary files differindex cec81528..3fd83cc9 100644 --- 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 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 Binary files differindex 9006bed3..8bf77835 100644 --- 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 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 Binary files differindex e9d76e1a..4089b095 100644 --- 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 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 Binary files differindex 2821a285..0faa9935 100755 --- 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 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 @@ </data> <key>Assets.car</key> <data> - Xrihp0M9X5FmIxaeGZ7doxdqeog= + GKP5ELVZRAReX7Y+C0G4yaxO6Kk= </data> <key>CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key> <data> - rnvajEbR2pLpwNzVRqmW0PEDN8g= + fOTgbUJk54yRmkWcTCFT7+wmKjU= </data> <key>CDVLaunchScreen.storyboardc/Info.plist</key> <data> @@ -106,7 +106,7 @@ </data> <key>CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib</key> <data> - o1OB+DkYiMTzF/2l2gcJ2D9omTU= + 2ttmDwLkZmOQZJm81hHhfHMJTBw= </data> <key>CDVNotification.bundle/beep.wav</key> <data> @@ -118,7 +118,7 @@ </data> <key>MainViewController.nib</key> <data> - VYjIHyUqgNvmk53zW/2nAsOGB3c= + HZ5DMDECsAU+S/qRs69uof0bGOw= </data> <key>PkgInfo</key> <data> @@ -230,7 +230,7 @@ </data> <key>www/css/products.css</key> <data> - 59uS6OlN1+LRQeumWcnpGy+UMq4= + TD/pdJU85wY38D+A8Mx72erBnhU= </data> <key>www/css/vendor/flickity.css</key> <data> @@ -350,7 +350,7 @@ </data> <key>www/index.html</key> <data> - q6oQx9+nrmqcNgsMMC5PFihzJ0I= + uQggcZ+EBKrDc4oQ0KwUNEvQde4= </data> <key>www/js/index.js</key> <data> @@ -510,7 +510,7 @@ </data> <key>www/js/lib/products/ProductView.js</key> <data> - frSEcy+Zr4wvorsFDcwd4HmSwKg= + n2nL3c4JKuvvbphytqgMxrIUvwQ= </data> <key>www/js/lib/products/Selector.js</key> <data> @@ -941,22 +941,22 @@ <dict> <key>hash</key> <data> - Xrihp0M9X5FmIxaeGZ7doxdqeog= + GKP5ELVZRAReX7Y+C0G4yaxO6Kk= </data> <key>hash2</key> <data> - ent7jBUfpB8OOozrJnYqASnJDjAiXiHBel4IxJTvGcw= + yqlk5wIVvuYcfWsc2ptvccPo4BlkcLNAwm7y1mlpwDc= </data> </dict> <key>CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key> <dict> <key>hash</key> <data> - rnvajEbR2pLpwNzVRqmW0PEDN8g= + fOTgbUJk54yRmkWcTCFT7+wmKjU= </data> <key>hash2</key> <data> - 12OlYGTq9Iwmv1q6yHlb0pxKff6p4W3+/R86h7+bzYI= + 0Eha3DYx0sAhLInrB1lubAuKAPMw5k6YaIqJYZIYXxg= </data> </dict> <key>CDVLaunchScreen.storyboardc/Info.plist</key> @@ -974,11 +974,11 @@ <dict> <key>hash</key> <data> - o1OB+DkYiMTzF/2l2gcJ2D9omTU= + 2ttmDwLkZmOQZJm81hHhfHMJTBw= </data> <key>hash2</key> <data> - IuuDf3x/6SimMFXOPDgCSlRek9kKiJPwTdvoEFeyoqE= + hcbgM16lH6WLo1zlYhPN5Qo21wTTl5uR63kAbNvLiPQ= </data> </dict> <key>CDVNotification.bundle/beep.wav</key> @@ -996,11 +996,11 @@ <dict> <key>hash</key> <data> - VYjIHyUqgNvmk53zW/2nAsOGB3c= + HZ5DMDECsAU+S/qRs69uof0bGOw= </data> <key>hash2</key> <data> - Y28WiTZEW77UszY6g73dz1lmNkB2bJluQEfYMFOJohc= + mR0ZMA3Uffd25oLklAZIOryyJv3p2HhspURsuhrkXK4= </data> </dict> <key>config.xml</key> @@ -1293,11 +1293,11 @@ <dict> <key>hash</key> <data> - 59uS6OlN1+LRQeumWcnpGy+UMq4= + TD/pdJU85wY38D+A8Mx72erBnhU= </data> <key>hash2</key> <data> - htRbkoM3G54WXqwhHcYsXQofeIPxdRAPy/LMAE3BEYc= + JJ6qUTuBPDSEavv3UwLVQaPAc439qtgrpAbKz48o3iE= </data> </dict> <key>www/css/vendor/flickity.css</key> @@ -1623,11 +1623,11 @@ <dict> <key>hash</key> <data> - q6oQx9+nrmqcNgsMMC5PFihzJ0I= + uQggcZ+EBKrDc4oQ0KwUNEvQde4= </data> <key>hash2</key> <data> - T1lBQ5kMTH0sk+snXx27xEGc0L1FA09vfLrUHZDWfF0= + ncVW/WzNr3I6IRlkX+5Q/Xci21RPsBWnw8WIuql6G4o= </data> </dict> <key>www/js/index.js</key> @@ -2063,11 +2063,11 @@ <dict> <key>hash</key> <data> - frSEcy+Zr4wvorsFDcwd4HmSwKg= + n2nL3c4JKuvvbphytqgMxrIUvwQ= </data> <key>hash2</key> <data> - PiTxNyCf6dI/7ObaS9jhiuOKZ1fMUP+JHRulVpafzrI= + 7iJuUgBMAyWIjtX3XCsW00JkOrBJZImKfSeW30aa5Mc= </data> </dict> <key>www/js/lib/products/Selector.js</key> 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 @@ <span class="share">SHARE +</span> </div> <div class="fit">Fits Large</div> + <div class='fitFooter'></div> <div class="notAvailableInCanada">Not Available In Canada</div> <div class="body"> </div> @@ -286,8 +287,6 @@ <br><br> We suggest you choose a smaller size than yours. </div> - <div class='fitFooter'> - </div> </div> </div> </div> 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, "<").replace(/>/g, "&rt;").split('\n').join("<br>") - $('.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, "<").replace(/>/g, "&rt;").split('\n').join("<br>") + $('.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 @@ <span class="share">SHARE +</span> </div> <div class="fit">Fits Large</div> + <div class='fitFooter'></div> <div class="notAvailableInCanada">Not Available In Canada</div> <div class="body"> </div> @@ -286,8 +287,6 @@ <br><br> We suggest you choose a smaller size than yours. </div> - <div class='fitFooter'> - </div> </div> </div> </div> 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, "<").replace(/>/g, "&rt;").split('\n').join("<br>") - $('.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, "<").replace(/>/g, "&rt;").split('\n').join("<br>") + $('.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() }, |
