Merge branch 'master' of https://github.com/okfocus/stone-island

5 files changed, 186 insertions, 34 deletions

diff --git a/StoneIsland/platforms/ios/www/css/account.css b/StoneIsland/platforms/ios/www/css/account.css
index d450c42c..31433871 100644
--- a/StoneIsland/platforms/ios/www/css/account.css
+++ b/StoneIsland/platforms/ios/www/css/account.css
@@ -396,4 +396,11 @@ input.switch:checked + label:after {
 }
 .select-wrapper.picked span {
   color: #000;
+}
+
+.country-wrapper-static {
+  text-align: center;
+  color: #a9a9a9;
+  padding-top: 9px;
+  font-size: 14px;
 }
\ No newline at end of file
diff --git a/StoneIsland/platforms/ios/www/css/blogs.css b/StoneIsland/platforms/ios/www/css/blogs.css
index 239e99bf..0dd14166 100644
--- a/StoneIsland/platforms/ios/www/css/blogs.css
+++ b/StoneIsland/platforms/ios/www/css/blogs.css
@@ -39,6 +39,8 @@
   display: none;
 }
 
+/* FAQ */
+
 .privacy #privacy { display: block }
 .terms #terms { display: block }
 .returns #returns { display: block }
@@ -100,32 +102,44 @@
 
 .gallery-multiple-images::before {
   border:1px solid black;
+  background:rgba(255,255,255,1);
+  background-image:url(../img/left-arrow.png);
+  background-size:5px 10px;
+  background-repeat:no-repeat;
+  background-position:center;
+  width:15px;
+  height:30px;
   top:50%;
-  transform:scale(.5,1) translateY(-50%);
-  transform-origin:top left;
+  content:'';
+  transform:translateY(-50%);
+  transform-origin:top right;
   left:20px;
-  content:'\25C0';
   font-size:18px;
-  padding:3px 14px 3px 11px;
+  padding:3px 3px 3px 1px;
   z-index:999;
   position:absolute;
   display:block;
-  background:rgba(255,255,255,1);
 }
 
 .gallery-multiple-images::after {
   border:1px solid black;
+  background:rgba(255,255,255,1);
+  background-image:url(../img/right-arrow.png);
+  background-size:5px 10px;
+  background-repeat:no-repeat;
+  background-position:center;
+  width:15px;
+  height:30px;
   top:50%;
-  transform:scale(.5,1) translateY(-50%);
+  content:'';
+  transform:translateY(-50%);
   transform-origin:top right;
   right:20px;
-  content:'\25B6';
   font-size:18px;
-  padding:3px 11px 3px 14px;
+  padding:3px 1px 3px 3px;
   z-index:999;
   position:absolute;
   display:block;
-  background:rgba(255,255,255,1);
 }
 
 /* NOTE: not sure if this down arrow is necessary.. the fade
@@ -188,15 +202,67 @@ ul.links {
   font-size:14px;
 }
 
-/* NOTE: not really sure how this is going to work on the archive page
-         based on the pdf mockup */
+.archive h2 {
+  font-size:32px
+}
 
-.archive .above {
-  width:calc(100vw - 80px);
-  box-sizing:border-box;
-  margin:0 auto;
+#archive .heading {
+  position: absolute;
+  top: 0; left: 0;
+  width: 100%;
+  pointer-events: none;
+}
+#archive .menu .items,
+#archive .row .image,
+#archive .row .text {
+  position: absolute;
+  top: 50%; left: 50%;
+  transform-origin: 50% 50%;
+  transform: translateZ(0) translateX(-50%) translateY(-50%);
 }
 
-.archive h2 {
-font-size:32px
-}
\ No newline at end of file
+#archive.menu .menu {
+  opacity: 1;
+  pointer-events: auto;
+}
+#archive .menu {
+  background: rgba(255,255,255,0.8);
+  position: absolute;
+  top: 0; left: 0;
+  height: 100%;
+  width: 100%;
+  opacity: 0;
+  pointer-events: none;
+  transition: opacity 0.2s;
+}
+#archive .menu .items {
+  width: 100%;
+}
+#archive .menu .item:first-of-type {
+  border-top: 1px solid black;
+}
+#archive .menu .item {
+  width: 100%;
+  text-align: center;
+  border-bottom: 1px solid black;
+  background: white;
+}
+
+#archive .scroll {
+  top: 0; left: 0;
+  height: 100%;
+}
+#archive .row {
+  position: relative;
+  min-height: 80vh;
+  perspective: 500;
+}
+#archive .row .image {
+  width: 100%; height: 100%;
+  background-repeat: no-repeat;
+  background-size: 80% auto;
+  background-position: center center;
+}
+#archive .row .text {
+  width: 80%;
+}
diff --git a/StoneIsland/platforms/ios/www/css/cart.css b/StoneIsland/platforms/ios/www/css/cart.css
index bc5088d5..a927f511 100644
--- a/StoneIsland/platforms/ios/www/css/cart.css
+++ b/StoneIsland/platforms/ios/www/css/cart.css
@@ -1,11 +1,5 @@
 
 .cart #cart { display: block; }
-.cart #footer .cancel { display: block }
-.cart #footer .checkout { display: block }
-/* 
-.cart #footer .checkout_proceed { display: block }
- */
-
 #cart {
   display: none;
 }
@@ -51,6 +45,8 @@ border-right: 1px solid #bbb
 
 .full .cart_body { display: block; }
 .empty .cart_empty { display: block; }
+#cart h1 .full_msg,
+#cart h1 .empty_msg { display: none }
 .cart_body {
   display: none;
 }
@@ -89,6 +85,10 @@ border-right: 1px solid #bbb
   top:16px;
 }
 
+#cart h3 {
+  padding-left: 5px;
+}
+
 .cart_item_row {
 display:table;
 position:relative;
@@ -189,4 +189,65 @@ font-weight:bold
 
 .cart-summary-row:last-child {
 color:#000;
-}
\ No newline at end of file
+}
+
+.dropdown-wrapper {
+  position:relative;
+  text-align:right;
+  width:calc(100vw - 10px);
+  margin:0 auto;
+  box-sizing:border-box;
+
+}
+
+.dropdown-wrapper .add_edit {
+  padding:10px;
+  letter-spacing:0.5px;
+  font-size:12px;
+  color:#a9a9a9;
+  box-sizing:border-box;
+}
+
+.dropdown-wrapper .dropdown {
+  font-size:14px;
+  box-sizing:border-box;
+  align-items: center;
+  text-align: center;
+  padding:10px 0;
+  border:1px solid #a9a9a9;
+  position:relative;
+}
+
+.dropdown-wrapper .dropdown::before {
+  content:'';
+  box-sizing:border-box;
+  right:25px;
+  width:1px;
+  top:50%;
+  transform:translateY(-50%) rotate(45deg);
+  height:12px;
+  background:#a9a9a9;
+  position:absolute;
+  z-index:999;
+  transform-origin:bottom left;
+}
+
+.dropdown-wrapper .dropdown::after {
+  content:'';
+  box-sizing:border-box;
+  right:25px;
+  width:1px;
+  top:50%;
+  transform:translateY(-50%) rotate(-45deg);
+  transform-origin:bottom right;
+  height:12px;
+  background:#a9a9a9;
+  position:absolute;
+  z-index:999;
+}
+#cart_shipping .address {
+  display: none;
+}
+.address .save_as_default {
+  display: none;
+}
diff --git a/StoneIsland/platforms/ios/www/css/index.css b/StoneIsland/platforms/ios/www/css/index.css
index 0d855aeb..a67e4bcf 100644
--- a/StoneIsland/platforms/ios/www/css/index.css
+++ b/StoneIsland/platforms/ios/www/css/index.css
@@ -8,6 +8,9 @@ body, html {
   padding: 0px;
   overflow: hidden;
 }
+body.loading {
+  opacity: 0;
+}
 body {
   -webkit-touch-callout: none;                /* prevent callout to copy image, etc when tap to hold */
   -webkit-text-size-adjust: none;             /* prevent webkit from resizing text to fit */
diff --git a/StoneIsland/platforms/ios/www/css/products.css b/StoneIsland/platforms/ios/www/css/products.css
index 6ab9d0bd..2e9ead53 100644
--- a/StoneIsland/platforms/ios/www/css/products.css
+++ b/StoneIsland/platforms/ios/www/css/products.css
@@ -33,6 +33,9 @@
   width: 100vw;
   height: 52vh;
 }
+.gallery.gray {
+  background: rgba(245,245,245,1.0);
+}
 
 .gallery .item {
   width: 100vw;
@@ -172,31 +175,43 @@
 
 #product #gallery::before {
   border:1px solid black;
+  background:rgba(255,255,255,1);
+  background-image:url(../img/left-arrow.png);
+  background-size:5px 10px;
+  background-repeat:no-repeat;
+  background-position:center;
+  width:15px;
+  height:30px;
   top:50%;
-  transform:scale(.5,1) translateY(-50%);
-  transform-origin:top left;
+  content:'';
+  transform:translateY(-50%);
+  transform-origin:top right;
   left:20px;
-  content:'\25C0';
   font-size:18px;
-  padding:3px 14px 3px 11px;
+  padding:3px 3px 3px 1px;
   z-index:999;
   position:absolute;
   display:block;
-  background:rgba(255,255,255,1);
 }
 
 #product #gallery::after {
   border:1px solid black;
+  background:rgba(255,255,255,1);
+  background-image:url(../img/right-arrow.png);
+  background-size:5px 10px;
+  background-repeat:no-repeat;
+  background-position:center;
+  width:15px;
+  height:30px;
   top:50%;
-  transform:scale(.5,1) translateY(-50%);
+  content:'';
+  transform:translateY(-50%);
   transform-origin:top right;
   right:20px;
-  content:'\25B6';
   font-size:18px;
-  padding:3px 11px 3px 14px;
+  padding:3px 1px 3px 3px;
   z-index:999;
   position:absolute;
   display:block;
-  background:rgba(255,255,255,1);
 }