From c6e799706173e54c1e39954e67a59d641cc27903 Mon Sep 17 00:00:00 2001
From: Rene Ae <aehtyb@gmail.com>
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 @@
           </div>
           <div class="container-fill">
             <div class="container-message premessage">               
-              <span class="newuser">New User?</span>
+              <div class="newuser">New User?</div>
+              <div class="forgotpassword">Forgot Password?</div>
             </div>
             <div class="container-message submessage">
               <span class="msg"></span>
@@ -417,18 +418,24 @@
             <h2>CHANGE PASSWORD</h2>
             <input type="password" name="CurrentPassword" placeholder="CURRENT PASSWORD" required>
             <input type="password" name="NewPassword" placeholder="NEW PASSWORD (7 CHARACTERS OR MORE)" required>
-            <div class="toggle-container">
-              <div class="caption">
-                <h3>Newsletter</h3>
-                Receive Stone Island Newsletter
-              </div>
-              <div class="toggle">
-                <input type="checkbox" id="receive-newsletter-profile" name="YooxLetter" class="switch" value="true">
-                <label for="receive-newsletter-profile"></label>
+            <div class="container-fill container-fill-condensed">
+              <div class="container-message container-message-condensed">
+                <span class="msg msg-condensed">
+                </span>
               </div>
             </div>
             <div class="container-row">
               <div class="checkbox-container">
+                <div class="checkbox-row">
+                  <div class="checkbox-toggle">
+                     <input type="checkbox" id="receive-newsletter-profile" name="YooxLetter" value="true" required>
+                     <label for="receive-newsletter-profile"></label>
+                  </div>
+                  <label class="checkbox-caption" for="receive-newsletter-profile">
+                  <b>Newsletter</b><br>
+                  Receive Stone Island Newsletter
+                  </label>
+                </div>
                 <div class="checkbox-row">
                   <div class="checkbox-toggle">
                      <input type="checkbox" id="checkbox-shopping-data-profiling-profile" name="DataProfiling" value="true" required>
@@ -444,14 +451,6 @@
               </div>
             </div>
           </div>
-          <div class="container-fill">
-            <div class="container-message">
-              <span class="msg">
-                * Your personal and payment<br>
-                information will always remain private
-              </span>
-            </div>
-          </div>
         </div>
       </form>
     </div>
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