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

3 files changed, 32 insertions, 6 deletions

diff --git a/StoneIsland/www/css/account.css b/StoneIsland/www/css/account.css
index 41f6b413..383b874a 100644
--- a/StoneIsland/www/css/account.css
+++ b/StoneIsland/www/css/account.css
@@ -211,6 +211,7 @@ input.switch:checked + label:after {
   top:64px;
 }
 
+
 .container-row {
   box-sizing:border-box;
 }
diff --git a/StoneIsland/www/css/cart.css b/StoneIsland/www/css/cart.css
index 2a409177..732317bb 100644
--- a/StoneIsland/www/css/cart.css
+++ b/StoneIsland/www/css/cart.css
@@ -17,12 +17,17 @@
 }
 #cart .steps span {
   display: inline-block;
-  font-size: 13px;
+  font-size: 14px;
   text-align: center;
-  padding: 5px 0;
+  padding: 15px 0 14px;
   color: #bbb;
   width: 33%;
+  position:relative;
 }
+.summary_step, .shipping_step {
+border-right: 1px solid #bbb
+}
+
 #cart.summary .summary_step,
 #cart.payment .payment_step,
 #cart.shipping .shipping_step {
@@ -37,7 +42,7 @@
 .cart_empty {
   display: none;
   text-align: center;
-  margin: 50px 0;
+  margin: 0;
 }
 
 #cart.summary #cart_summary { display: block }
@@ -64,3 +69,13 @@
 #cart_thanks {
   display: none;
 }
+
+.summary-container {
+  top:0px;
+}
+
+.billing-container {
+  height:calc(100vh - 210px);
+  top:16px;
+}
+
diff --git a/StoneIsland/www/index.html b/StoneIsland/www/index.html
index 8de0feb9..2d34f6ef 100644
--- a/StoneIsland/www/index.html
+++ b/StoneIsland/www/index.html
@@ -543,9 +543,11 @@
       <span class="shipping_step">SHIPPING</span>
       <span class="payment_step">BILLING</span>
     </div>
-
+    
     <div id="cart_summary">
       <div class="scroll">
+        <div class="summary-container container">
+        <div class="container-row">
         <div class="cart_body">
           <div class="rows">
             <script type="text/html" class="template">
@@ -580,8 +582,12 @@
             <span class="total"></span>
           </div>
         </div>
-        <div class="cart_empty">
-          You have nothing in your cart.
+        </div>
+        <div class="container-fill">
+          <div class="container-message cart_empty">
+            You have nothing in your cart.
+          </div>
+        </div>
         </div>
       </div>
     </div>
@@ -611,8 +617,11 @@
     <div id="cart_payment">
       <div class="scroll">
         <form>
+        <div class="billing-container container">
+        <div class="container-row">
           <div class="cc"></div>
           <div class="address"></div>
+          </div>
           <div class="container-fill">
             <div class="container-message">
               <span class="msg">
@@ -621,6 +630,7 @@
               </span>
             </div>
           </div>
+          </div>
         </form>
       </div>
     </div>