cart height

4 files changed, 21 insertions, 9 deletions

diff --git a/StoneIsland/www/css/account.css b/StoneIsland/www/css/account.css
index 383b874a..c8961a69 100644
--- a/StoneIsland/www/css/account.css
+++ b/StoneIsland/www/css/account.css
@@ -200,8 +200,8 @@ input.switch:checked + label:after {
 }
 
 .container {
-  position:absolute; 
-  height:calc(100vh - 154px);
+  position:relative; 
+  min-height:calc(100vh - 154px);
   width:100vw;
   box-sizing:border-box;
   display: flex;  
diff --git a/StoneIsland/www/css/cart.css b/StoneIsland/www/css/cart.css
index 732317bb..908e376f 100644
--- a/StoneIsland/www/css/cart.css
+++ b/StoneIsland/www/css/cart.css
@@ -34,6 +34,21 @@ border-right: 1px solid #bbb
   color: #000;
 }
 
+#cart_summary,
+#cart_shipping,
+#cart_payment,
+#cart_confirm,
+#cart_thanks {
+  height: calc(100vh - 195px);
+  overflow: hidden;
+  position: relative;
+}
+
+#cart.summary #cart_summary { display: block }
+#cart_summary {
+  display: none;
+}
+
 .full .cart_body { display: block; }
 .empty .cart_empty { display: block; }
 .cart_body {
@@ -45,10 +60,6 @@ border-right: 1px solid #bbb
   margin: 0;
 }
 
-#cart.summary #cart_summary { display: block }
-#cart_summary {
-  display: none;
-}
 
 #cart.payment #cart_payment { display: block }
 #cart_payment {
@@ -78,4 +89,3 @@ border-right: 1px solid #bbb
   height:calc(100vh - 210px);
   top:16px;
 }
-
diff --git a/StoneIsland/www/js/lib/cart/CartSummary.js b/StoneIsland/www/js/lib/cart/CartSummary.js
index 8e81c050..4ca6ab64 100644
--- a/StoneIsland/www/js/lib/cart/CartSummary.js
+++ b/StoneIsland/www/js/lib/cart/CartSummary.js
@@ -102,6 +102,7 @@ var CartSummary = ScrollableView.extend({
                     .replace(/{{quantity}}/, 1)
                     .replace(/{{price}}/, as_cash(details.Item.Price.DiscountedPrice))
         $el.html(t)
+        this.deferScrollToTop()
       }.bind(this))
     }.bind(this))
     
@@ -127,7 +128,8 @@ var CartSummary = ScrollableView.extend({
     this.$el.addClass("empty").removeClass("full")
   },
 
-  ok: function(){
+  save: function(){
+    console.log("HI")
     app.router.go('cart/shipping')
   },
   
diff --git a/StoneIsland/www/js/vendor/view/scrollable.js b/StoneIsland/www/js/vendor/view/scrollable.js
index 2de6a108..7cd96f89 100644
--- a/StoneIsland/www/js/vendor/view/scrollable.js
+++ b/StoneIsland/www/js/vendor/view/scrollable.js
@@ -1,7 +1,7 @@
 var ScrollableView = View.extend({
   
   events: {
-    "load img": "refreshScroller",
+    "load img": "deferScrollToTop",
   },
 
   deferScrollToTop: function(){