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

---
 .../platforms/android/assets/www/css/account.css   | 39 +++++++++++++++---
 .../platforms/android/assets/www/css/blogs.css     |  8 ++++
 .../platforms/android/assets/www/css/cart.css      |  4 ++
 .../platforms/android/assets/www/css/nav.css       | 46 ++++++++++++++++++----
 .../platforms/android/assets/www/css/products.css  |  4 +-
 5 files changed, 86 insertions(+), 15 deletions(-)

(limited to 'StoneIsland/platforms/android/assets/www/css')

diff --git a/StoneIsland/platforms/android/assets/www/css/account.css b/StoneIsland/platforms/android/assets/www/css/account.css
index fbb960d0..4c71ac57 100755
--- a/StoneIsland/platforms/android/assets/www/css/account.css
+++ b/StoneIsland/platforms/android/assets/www/css/account.css
@@ -172,7 +172,17 @@ input[type=text], input[type=password], input[type=number], input[type=email] {
   border-right: 1px solid #a9a9a9;
 }
 
-.toggle-container {
+#signup .toggle-container, #profile .toggle-container {
+  margin: 0px auto;
+  display: table;
+  margin-top: 0px;
+  width: calc(100vw - 10px);
+  box-sizing: border-box;
+  padding:0px 18px 2px;
+  font-size:14px;
+}
+
+#settings .toggle-container {
   margin: 0px auto;
   display: table;
   margin-top: 10px;
@@ -285,23 +295,29 @@ 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;
   width:calc(100vw - 10px);
   box-sizing:border-box;
-  margin:10px auto;
+  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;
@@ -340,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;
@@ -495,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/android/assets/www/css/blogs.css b/StoneIsland/platforms/android/assets/www/css/blogs.css
index 7af45c4f..8b27dda9 100755
--- a/StoneIsland/platforms/android/assets/www/css/blogs.css
+++ b/StoneIsland/platforms/android/assets/www/css/blogs.css
@@ -129,6 +129,7 @@ animation: mfadein 0.6s;
   z-index:2;
   position:absolute;
   display:block;
+  animation: gallery-fade 4s forwards;
 }
 
 .gallery-right {
@@ -150,8 +151,15 @@ animation: mfadein 0.6s;
   z-index:2;
   position:absolute;
   display:block;
+  animation: gallery-fade 4s forwards;
 }
 
+@-webkit-keyframes gallery-fade {
+  0%{opacity:0}
+  20%{opacity:1}
+  78% {opacity:1}
+  100% {opacity:0}
+}
 /* NOTE: not sure if this down arrow is necessary.. the fade
          might do..? what do you think? it can be removed
          with javascript when the body hits the bottom of
diff --git a/StoneIsland/platforms/android/assets/www/css/cart.css b/StoneIsland/platforms/android/assets/www/css/cart.css
index 9fbc54b3..c214c93e 100755
--- a/StoneIsland/platforms/android/assets/www/css/cart.css
+++ b/StoneIsland/platforms/android/assets/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/android/assets/www/css/nav.css b/StoneIsland/platforms/android/assets/www/css/nav.css
index c769dabd..05e4aedc 100755
--- a/StoneIsland/platforms/android/assets/www/css/nav.css
+++ b/StoneIsland/platforms/android/assets/www/css/nav.css
@@ -81,7 +81,7 @@
   font-size: 14px;
   letter-spacing:1.25px;
   color: #bbb;
-  padding: 4px 0 7px 20px
+  padding: 4px 0 12px 20px
 }
 
 #nav .social {
@@ -321,20 +321,46 @@ padding-bottom:0px;
 #selector {
   display: none;
   position: absolute;
-  bottom: 0; left: 0;
   background: #fff;
   z-index: 2;
-  width:100%;
-  box-sizing:border-box
+  box-sizing:border-box;
+  min-width:100px;
+  animation: selector-spring .15s forwards;
+  animation-timing-function: cubic-bezier(.43,1,.89,.95)
 }
+
+@keyframes selector-spring { 
+  0% { 
+  margin-top: 15px
+  } 
+  100% { 
+  margin-top: 0
+  } 
+} 
+
 #selector .options div {
-  width: 100%;
   background: white;
   text-align: center;
-  padding: 8px;
-
+  padding: 7px 12px;
   box-sizing:border-box;
   font-size: 14px;
+  border-left:1px solid black;
+  border-right:1px solid black;
+  border-top:1px solid black;
+
+}
+
+#selector .options div:last-of-type {
+  border-bottom:1px solid black
+}
+
+.selector-full {
+    width: 100% !important;
+    box-sizing:border-box
+}
+
+.selector-full > div > div {
+    padding: 12px 0 !important;
 }
 
 /* CONTENT */
@@ -369,6 +395,10 @@ h1 {
 }
 
 .msg {
-  padding: 20px;
+  margin: 20px;
   display: inline-block;
 }
+
+.msg-condensed {
+  margin:6px!important;
+}
diff --git a/StoneIsland/platforms/android/assets/www/css/products.css b/StoneIsland/platforms/android/assets/www/css/products.css
index bc215573..52de76d0 100755
--- a/StoneIsland/platforms/android/assets/www/css/products.css
+++ b/StoneIsland/platforms/android/assets/www/css/products.css
@@ -22,6 +22,7 @@
 }
 #product .style {
   text-transform: uppercase;
+    box-sizing:border-box
 }
 
 #product.loading #gallery,
@@ -117,7 +118,8 @@
 
 .product .size {
   padding-right:16px;
-  position:relative
+  position:relative;
+    box-sizing:border-box
 }
 
 .product .price {
-- 
cgit v1.2.3-70-g09d2


From 5cb848da1e48574c92da2ec67d2367fc0b0cbbe7 Mon Sep 17 00:00:00 2001
From: Rene Ae <aehtyb@gmail.com>
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/android/assets/www/css')

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
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 @@
 <?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
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 @@
           <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>
-- 
cgit v1.2.3-70-g09d2