diff options
18 files changed, 34 insertions, 45 deletions
diff --git a/StoneIsland/config.xml b/StoneIsland/config.xml index 35708e80..28e0a41e 100755 --- a/StoneIsland/config.xml +++ b/StoneIsland/config.xml @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<widget id="us.okfoc.stoneisland" version="0.4.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> +<widget id="us.okfoc.stoneisland" version="0.4.2" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <name>Stone Island</name> <description> Stone Island @@ -30,6 +30,7 @@ <preference name="StatusBarStyle" value="lightcontent" /> <platform name="android"> + <allow-intent href="market:*" /> <preference name="AndroidLaunchMode" value="singleTop"/> <preference name="android-minSdkVersion" value="21" /> </platform> diff --git a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock Binary files differindex 205bc19f..9e98913b 100755 --- a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock +++ b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock diff --git a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin Binary files differindex d91af426..0780d29a 100755 --- a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin +++ b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin diff --git a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin Binary files differindex 2ed10847..aa15917a 100755 --- a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin +++ b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin diff --git a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin Binary files differindex ed9f7758..ea6cd8f3 100755 --- a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin +++ b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin diff --git a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin Binary files differindex bf02cdb4..11984ec1 100755 --- a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin +++ b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin diff --git a/StoneIsland/platforms/android/AndroidManifest.xml b/StoneIsland/platforms/android/AndroidManifest.xml index 75efccb1..1d67db96 100755 --- a/StoneIsland/platforms/android/AndroidManifest.xml +++ b/StoneIsland/platforms/android/AndroidManifest.xml @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<manifest android:hardwareAccelerated="true" android:versionCode="401" android:versionName="0.4.1" package="us.okfoc.stoneisland" xmlns:android="http://schemas.android.com/apk/res/android"> +<manifest android:hardwareAccelerated="true" android:versionCode="402" android:versionName="0.4.2" package="us.okfoc.stoneisland" xmlns:android="http://schemas.android.com/apk/res/android"> <supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:resizeable="true" android:smallScreens="true" android:xlargeScreens="true" /> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> diff --git a/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/debug/classes.jar b/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/debug/classes.jar Binary files differindex bacc2333..7709f764 100755 --- a/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/debug/classes.jar +++ b/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/debug/classes.jar diff --git a/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/release/classes.jar b/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/release/classes.jar Binary files differindex 5ea04df3..76f4432e 100755 --- a/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/release/classes.jar +++ b/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/release/classes.jar diff --git a/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-debug.aar b/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-debug.aar Binary files differindex 00824ca3..ddef43e0 100755 --- a/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-debug.aar +++ b/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-debug.aar diff --git a/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-release.aar b/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-release.aar Binary files differindex ea277311..7a37ff53 100755 --- a/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-release.aar +++ b/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-release.aar diff --git a/StoneIsland/platforms/android/assets/www/css/account.css b/StoneIsland/platforms/android/assets/www/css/account.css index 4c71ac57..b77cd428 100755 --- a/StoneIsland/platforms/android/assets/www/css/account.css +++ b/StoneIsland/platforms/android/assets/www/css/account.css @@ -353,6 +353,10 @@ input.switch:checked + label:after { margin:0 auto; } +#signup .checkbox-container { + margin-top:12px!important +} + .checkbox-toggle { display:table-cell; box-sizing:border-box; diff --git a/StoneIsland/platforms/android/assets/www/css/cart.css b/StoneIsland/platforms/android/assets/www/css/cart.css index c214c93e..5c910eb4 100755 --- a/StoneIsland/platforms/android/assets/www/css/cart.css +++ b/StoneIsland/platforms/android/assets/www/css/cart.css @@ -357,6 +357,6 @@ color:#000; margin-top:0px } -#cart .scroll, #payment .scroll, #shipping .scroll { +#cart .scroll, #payment .scroll, #shipping .scroll, #signup .scroll { min-height:calc(100% + 100px) }
\ No newline at end of file diff --git a/StoneIsland/platforms/android/assets/www/index.html b/StoneIsland/platforms/android/assets/www/index.html index 9f8da2b4..b9dd0a91 100755 --- a/StoneIsland/platforms/android/assets/www/index.html +++ b/StoneIsland/platforms/android/assets/www/index.html @@ -360,28 +360,18 @@ <input type="password" name="Password" placeholder="PASSWORD (7 CHARACTERS OR MORE)" required> <input type="password" name="Password2" placeholder="CONFIRM PASSWORD" required> </div> - <div class="container-row"> - <div class="container-message"> - <span class="msg"> - * Your personal and payment<br> - information will always remain private - </span> - </div> - </div> - - <div class="toggle-container"> - <div class="caption"> - <h3>Newsletter</h3> - Receive Stone Island Newsletter - </div> - <div class="toggle"> - <input type="checkbox" id="receive-newsletter-signup" name="YooxLetter" class="switch" value="true"> - <label for="receive-newsletter-signup"></label> - </div> - </div> <div class="container-row"> - <div class="checkbox-container"> + <div class="checkbox-container "> + <div class="checkbox-row"> + <div class="checkbox-toggle"> + <input type="checkbox" id="checkbox-data-profiling" name="DataProfiling" value="true" required> + <label for="checkbox-data-profiling"></label> + </div> + <label class="checkbox-caption" for="checkbox-data-profiling"> + I agree that YOOX and SPORTSWEAR COMPANY may collect my personal information for marketing purposes (newsletters, news and promotions). + </label> + </div> <div class="checkbox-row"> <div class="checkbox-toggle"> <input type="checkbox" id="checkbox-shopping-data-profiling" name="DataProfiling" value="true" required> diff --git a/StoneIsland/platforms/android/res/xml/config.xml b/StoneIsland/platforms/android/res/xml/config.xml index ba194884..e2f16385 100755 --- a/StoneIsland/platforms/android/res/xml/config.xml +++ b/StoneIsland/platforms/android/res/xml/config.xml @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<widget id="us.okfoc.stoneisland" version="0.4.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> +<widget id="us.okfoc.stoneisland" version="0.4.2" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <preference name="loglevel" value="DEBUG" /> <feature name="Keyboard"> <param name="android-package" value="com.ionic.keyboard.IonicKeyboard" /> diff --git a/StoneIsland/platforms/ios/www/css/account.css b/StoneIsland/platforms/ios/www/css/account.css index 4c71ac57..b77cd428 100755 --- a/StoneIsland/platforms/ios/www/css/account.css +++ b/StoneIsland/platforms/ios/www/css/account.css @@ -353,6 +353,10 @@ input.switch:checked + label:after { margin:0 auto; } +#signup .checkbox-container { + margin-top:12px!important +} + .checkbox-toggle { display:table-cell; box-sizing:border-box; diff --git a/StoneIsland/platforms/ios/www/css/cart.css b/StoneIsland/platforms/ios/www/css/cart.css index c214c93e..5c910eb4 100755 --- a/StoneIsland/platforms/ios/www/css/cart.css +++ b/StoneIsland/platforms/ios/www/css/cart.css @@ -357,6 +357,6 @@ color:#000; margin-top:0px } -#cart .scroll, #payment .scroll, #shipping .scroll { +#cart .scroll, #payment .scroll, #shipping .scroll, #signup .scroll { min-height:calc(100% + 100px) }
\ No newline at end of file diff --git a/StoneIsland/platforms/ios/www/index.html b/StoneIsland/platforms/ios/www/index.html index 9f8da2b4..b9dd0a91 100755 --- a/StoneIsland/platforms/ios/www/index.html +++ b/StoneIsland/platforms/ios/www/index.html @@ -360,28 +360,18 @@ <input type="password" name="Password" placeholder="PASSWORD (7 CHARACTERS OR MORE)" required> <input type="password" name="Password2" placeholder="CONFIRM PASSWORD" required> </div> - <div class="container-row"> - <div class="container-message"> - <span class="msg"> - * Your personal and payment<br> - information will always remain private - </span> - </div> - </div> - - <div class="toggle-container"> - <div class="caption"> - <h3>Newsletter</h3> - Receive Stone Island Newsletter - </div> - <div class="toggle"> - <input type="checkbox" id="receive-newsletter-signup" name="YooxLetter" class="switch" value="true"> - <label for="receive-newsletter-signup"></label> - </div> - </div> <div class="container-row"> - <div class="checkbox-container"> + <div class="checkbox-container "> + <div class="checkbox-row"> + <div class="checkbox-toggle"> + <input type="checkbox" id="checkbox-data-profiling" name="DataProfiling" value="true" required> + <label for="checkbox-data-profiling"></label> + </div> + <label class="checkbox-caption" for="checkbox-data-profiling"> + I agree that YOOX and SPORTSWEAR COMPANY may collect my personal information for marketing purposes (newsletters, news and promotions). + </label> + </div> <div class="checkbox-row"> <div class="checkbox-toggle"> <input type="checkbox" id="checkbox-shopping-data-profiling" name="DataProfiling" value="true" required> |