Merge branch 'android' of github.com:okfocus/stone-island into android

8 files changed, 82 insertions, 23 deletions

diff --git a/StoneIsland/www/css/account.css b/StoneIsland/www/css/account.css
index fbb960d0..fd5ffdf6 100755
--- a/StoneIsland/www/css/account.css
+++ b/StoneIsland/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;
@@ -297,7 +307,7 @@ input.switch:checked + label:after {
   text-align:center;
   width:calc(100vw - 10px);
   box-sizing:border-box;
-  margin:10px auto;
+  margin:10px auto 0;
   position:relative
   
 }
diff --git a/StoneIsland/www/css/blogs.css b/StoneIsland/www/css/blogs.css
index 7af45c4f..8b27dda9 100755
--- a/StoneIsland/www/css/blogs.css
+++ b/StoneIsland/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/www/css/nav.css b/StoneIsland/www/css/nav.css
index c769dabd..832ec46a 100755
--- a/StoneIsland/www/css/nav.css
+++ b/StoneIsland/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 */
diff --git a/StoneIsland/www/css/products.css b/StoneIsland/www/css/products.css
index bc215573..52de76d0 100755
--- a/StoneIsland/www/css/products.css
+++ b/StoneIsland/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 {
diff --git a/StoneIsland/www/index.html b/StoneIsland/www/index.html
index 21430eb3..d6581b76 100755
--- a/StoneIsland/www/index.html
+++ b/StoneIsland/www/index.html
@@ -195,7 +195,7 @@
     </div>
     <div class="heading">
       <h1>ARCHIVE</h1>
-      <div class="subtitle">'982-'015</div>
+      <div class="subtitle">'982'015</div>
     </div>
   </div>
   
@@ -352,7 +352,7 @@
           <input type="email" name="ConfirmEmail" placeholder="CONFIRM EMAIL ADDRESS" required>
           <div class="select-wrapper date-wrapper">
             <span>BIRTHDAY (MM/DD/YYYY)</span>
-            <input type="date" name="BirthDay" placeholder="BIRTHDAY (MM/DD/YYYY)" required>
+            <input type="date" name="BirthDay" min="1900-01-01" placeholder="BIRTHDAY (MM/DD/YYYY)" required>
           </div>
 
           <h2>PASSWORD</h2>
@@ -411,7 +411,7 @@
             <input type="email" name="Email" placeholder="EMAIL ADDRESS" required>
             <div class="select-wrapper date-wrapper">
               <span>BIRTHDAY (MM/DD/YYYY)</span>
-              <input type="date" name="BirthDay" placeholder="BIRTHDAY (MM/DD/YYYY)" required>
+              <input type="date" name="BirthDay" min="1900-01-01" placeholder="BIRTHDAY (MM/DD/YYYY)" required>
             </div>
 
             <h2>CHANGE PASSWORD</h2>
diff --git a/StoneIsland/www/js/index.js b/StoneIsland/www/js/index.js
index 050a729c..ad4c6d20 100755
--- a/StoneIsland/www/js/index.js
+++ b/StoneIsland/www/js/index.js
@@ -3,7 +3,7 @@ var app = (function(){
   
   app.init = function(){  
 
-    sdk.init({ env: "production" })
+    sdk.init({ env: "development" })
 
     app.bind()
     app.build()
diff --git a/StoneIsland/www/js/lib/nav/NavView.js b/StoneIsland/www/js/lib/nav/NavView.js
index 54be5f77..fc373858 100755
--- a/StoneIsland/www/js/lib/nav/NavView.js
+++ b/StoneIsland/www/js/lib/nav/NavView.js
@@ -115,7 +115,7 @@ var NavView = View.extend({
     app.router.go("account/settings")
   },
   return_link: function(){
-    window.open("http://www.stoneisland.com/", '_system')
+    window.open("http://www.stoneisland.com/localize.asp?tskay=4036416C&page=help/return&deviceYeti=smartphone", '_system')
   },
 
 
@@ -135,7 +135,7 @@ var NavView = View.extend({
     app.router.go("page/terms")
   },
   care: function(){
-    window.open("http://www.stoneisland.com/localize.asp?tskay=4036416C&page=help/return&deviceYeti=smartphone", '_system')
+    window.open("http://www.stoneisland.com/localize.asp?tskay=4036416C&page=help/home&deviceYeti=smartphone", '_system')
   },
 
 
diff --git a/StoneIsland/www/js/lib/products/Selector.js b/StoneIsland/www/js/lib/products/Selector.js
index 4e23ba1f..4e0a5f04 100755
--- a/StoneIsland/www/js/lib/products/Selector.js
+++ b/StoneIsland/www/js/lib/products/Selector.js
@@ -27,13 +27,26 @@ var Selector = View.extend({
     this.$el.show()
     app.curtain.show("white")
     this.visible = true
-//     var selectionXY = $("." + origin).offset()
-//     var selectionWidth = $("." + origin).width()
-//     var selectorHeight = $('#selector').height()
-//     console.log(selectionXY.left)
-//     console.log(selectionXY.top)
-// 
-//       $("#selector").css({"top":(selectionXY.top - selectorHeight),"left":selectionXY.left})
+    if ( origin == "wide") {
+      $("#selector").addClass("selector-full")
+    }
+    else {
+      $("#selector").removeClass("selector-full")
+    }
+     var originXY = $("." + origin).offset()
+     var originWidth = $("." + origin).width()
+     var selectorHeight = $('#selector').height()
+     var originHeight = $("." + origin).height()
+     console.log(originXY.left)
+     console.log(originXY.top)
+     console.log(selectorHeight)
+     console.log(origin)
+
+       $("#selector").css({"top":(originXY.top - selectorHeight - originHeight + 20),"left":originXY.left})
+    originXY = null;
+    originWidth = null;
+    originHeight = null;
+    selectorHeight = null;
   },
   
   hide: function(){