From c6e799706173e54c1e39954e67a59d641cc27903 Mon Sep 17 00:00:00 2001 From: Rene Ae Date: Tue, 22 Dec 2015 05:09:42 -0600 Subject: cordova test --- StoneIsland/platforms/ios/www/css/account.css | 25 +++++++++++++--- StoneIsland/platforms/ios/www/css/cart.css | 4 +++ StoneIsland/platforms/ios/www/css/nav.css | 6 +++- StoneIsland/platforms/ios/www/index.html | 33 +++++++++++----------- .../platforms/ios/www/js/lib/auth/LoginView.js | 5 ++++ .../www/cdv-plugin-parse.js | 0 6 files changed, 51 insertions(+), 22 deletions(-) mode change 100644 => 100755 StoneIsland/platforms/ios/www/plugins/com.parse.cordova.core.pushplugin/www/cdv-plugin-parse.js (limited to 'StoneIsland/platforms/ios') diff --git a/StoneIsland/platforms/ios/www/css/account.css b/StoneIsland/platforms/ios/www/css/account.css index fd5ffdf6..4c71ac57 100755 --- a/StoneIsland/platforms/ios/www/css/account.css +++ b/StoneIsland/platforms/ios/www/css/account.css @@ -295,13 +295,17 @@ input.switch:checked + label:after { } .container-fill { - min-height:50px; + min-height:80px; flex: 1; align-items: center; justify-content: center; position:relative; } +.container-fill-condensed { + min-height:38px!important; +} + .container-row .container-message { color:#000; text-align:center; @@ -309,9 +313,11 @@ input.switch:checked + label:after { box-sizing:border-box; margin:10px auto 0; position:relative - } +.container-row .container-message-condensed { + margin: 2px auto!important +} .container-fill .container-message { font-size:12px; letter-spacing:0.5px; @@ -350,12 +356,12 @@ input.switch:checked + label:after { .checkbox-toggle { display:table-cell; box-sizing:border-box; - padding-right:15px; + padding-right:0px; position:relative; } .checkbox-toggle input { - width: 50px; + width: 45px; height: 35px; opacity: 0; z-index: 99999; @@ -505,4 +511,15 @@ margin-top:0px #login .container-row input:first-child { margin-bottom:9px!important +} + +.newuser { + display:inline-block; + padding:14px; + text-decoration:underline +} + +.forgotpassword { + padding:14px; + text-decoration:underline } \ No newline at end of file diff --git a/StoneIsland/platforms/ios/www/css/cart.css b/StoneIsland/platforms/ios/www/css/cart.css index 9fbc54b3..c214c93e 100755 --- a/StoneIsland/platforms/ios/www/css/cart.css +++ b/StoneIsland/platforms/ios/www/css/cart.css @@ -355,4 +355,8 @@ color:#000; #cart_shipping .half-input input { margin-top:0px +} + +#cart .scroll, #payment .scroll, #shipping .scroll { + min-height:calc(100% + 100px) } \ No newline at end of file diff --git a/StoneIsland/platforms/ios/www/css/nav.css b/StoneIsland/platforms/ios/www/css/nav.css index 832ec46a..05e4aedc 100755 --- a/StoneIsland/platforms/ios/www/css/nav.css +++ b/StoneIsland/platforms/ios/www/css/nav.css @@ -395,6 +395,10 @@ h1 { } .msg { - padding: 20px; + margin: 20px; display: inline-block; } + +.msg-condensed { + margin:6px!important; +} diff --git a/StoneIsland/platforms/ios/www/index.html b/StoneIsland/platforms/ios/www/index.html index d6581b76..9f8da2b4 100755 --- a/StoneIsland/platforms/ios/www/index.html +++ b/StoneIsland/platforms/ios/www/index.html @@ -316,7 +316,8 @@
- New User? +
New User?
+
Forgot Password?
@@ -417,18 +418,24 @@

CHANGE PASSWORD

-
-
-

Newsletter

- Receive Stone Island Newsletter -
-
- - +
+
+ +
+
+
+ + +
+ +
@@ -444,14 +451,6 @@
-
-
- - * Your personal and payment
- information will always remain private - -
-
diff --git a/StoneIsland/platforms/ios/www/js/lib/auth/LoginView.js b/StoneIsland/platforms/ios/www/js/lib/auth/LoginView.js index 4ef2823f..504827c8 100755 --- a/StoneIsland/platforms/ios/www/js/lib/auth/LoginView.js +++ b/StoneIsland/platforms/ios/www/js/lib/auth/LoginView.js @@ -6,6 +6,7 @@ var LoginView = FormView.extend({ events: { "click .newuser": "new_user", + "click .forgotpassword": "forgot_password", "submit form": "save", }, @@ -29,6 +30,10 @@ var LoginView = FormView.extend({ new_user: function(){ app.router.go("account/signup") + }, + + forgot_password: function(){ + window.open("http://www.stoneisland.co.uk/pages/forgotten-password", '_system') }, validate_presence: { diff --git a/StoneIsland/platforms/ios/www/plugins/com.parse.cordova.core.pushplugin/www/cdv-plugin-parse.js b/StoneIsland/platforms/ios/www/plugins/com.parse.cordova.core.pushplugin/www/cdv-plugin-parse.js old mode 100644 new mode 100755 -- cgit v1.2.3-70-g09d2 From 5cb848da1e48574c92da2ec67d2367fc0b0cbbe7 Mon Sep 17 00:00:00 2001 From: Rene Ae Date: Tue, 22 Dec 2015 14:16:46 -0600 Subject: cordova android --- StoneIsland/config.xml | 3 ++- .../2.2.1/taskArtifacts/cache.properties.lock | Bin 17 -> 17 bytes .../.gradle/2.2.1/taskArtifacts/fileHashes.bin | Bin 176291 -> 177131 bytes .../.gradle/2.2.1/taskArtifacts/fileSnapshots.bin | Bin 1339135 -> 2295593 bytes .../2.2.1/taskArtifacts/outputFileStates.bin | Bin 21362 -> 21362 bytes .../.gradle/2.2.1/taskArtifacts/taskArtifacts.bin | Bin 85503 -> 137338 bytes StoneIsland/platforms/android/AndroidManifest.xml | 2 +- .../build/intermediates/bundles/debug/classes.jar | Bin 119444 -> 119444 bytes .../intermediates/bundles/release/classes.jar | Bin 119367 -> 119367 bytes .../build/outputs/aar/CordovaLib-debug.aar | Bin 110009 -> 109969 bytes .../build/outputs/aar/CordovaLib-release.aar | Bin 109954 -> 109895 bytes .../platforms/android/assets/www/css/account.css | 4 +++ .../platforms/android/assets/www/css/cart.css | 2 +- .../platforms/android/assets/www/index.html | 30 +++++++-------------- StoneIsland/platforms/android/res/xml/config.xml | 2 +- StoneIsland/platforms/ios/www/css/account.css | 4 +++ StoneIsland/platforms/ios/www/css/cart.css | 2 +- StoneIsland/platforms/ios/www/index.html | 30 +++++++-------------- 18 files changed, 34 insertions(+), 45 deletions(-) (limited to 'StoneIsland/platforms/ios') 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 @@ - + Stone Island Stone Island @@ -30,6 +30,7 @@ + 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 index 205bc19f..9e98913b 100755 Binary files a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock and b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock differ diff --git a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin index d91af426..0780d29a 100755 Binary files a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin and b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin differ diff --git a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin index 2ed10847..aa15917a 100755 Binary files a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin and b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin differ diff --git a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin index ed9f7758..ea6cd8f3 100755 Binary files a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin and b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin differ diff --git a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin index bf02cdb4..11984ec1 100755 Binary files a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin and b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin differ 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 @@ - + diff --git a/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/debug/classes.jar b/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/debug/classes.jar index bacc2333..7709f764 100755 Binary files a/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/debug/classes.jar and b/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/debug/classes.jar differ diff --git a/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/release/classes.jar b/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/release/classes.jar index 5ea04df3..76f4432e 100755 Binary files a/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/release/classes.jar and b/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/release/classes.jar differ diff --git a/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-debug.aar b/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-debug.aar index 00824ca3..ddef43e0 100755 Binary files a/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-debug.aar and b/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-debug.aar differ diff --git a/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-release.aar b/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-release.aar index ea277311..7a37ff53 100755 Binary files a/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-release.aar and b/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-release.aar differ 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 @@
-
-
- - * Your personal and payment
- information will always remain private - -
-
- -
-
-

Newsletter

- Receive Stone Island Newsletter -
-
- - -
-
-
+
+
+
+ + +
+ +
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 @@ - + 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 @@
-
-
- - * Your personal and payment
- information will always remain private - -
-
- -
-
-

Newsletter

- Receive Stone Island Newsletter -
-
- - -
-
-
+
+
+
+ + +
+ +
-- cgit v1.2.3-70-g09d2