Merge branch 'developer' of http://47.99.244.21:9999/root/joshine into developer

app/design/frontend/Joshine/breeze/web/css/_custom.less

@@ -780,7 +780,7 @@ p.shopbycate-title {
 }
 }
 @media (min-width: 768px) {
 @media (min-width: 768px) {
   .checkout-cart-index .cart-container {
   .checkout-cart-index .cart-container {
-    min-height: 600px;
+    padding-bottom: 2rem;
   }
   }
   .checkout-cart-index .cart-container .cart.actions {
   .checkout-cart-index .cart-container .cart.actions {
     border-top:none;
     border-top:none;
@@ -898,7 +898,6 @@ p.shopbycate-title {
 
 
 .checkout-index-index .page-footer,.checkout-cart-index .page-footer{
 .checkout-index-index .page-footer,.checkout-cart-index .page-footer{
   background-color: #FFFFFF;
   background-color: #FFFFFF;
-  padding-top:20px;
 }
 }
 @media (min-width: 768px){
 @media (min-width: 768px){
   .checkout-index-index .page-footer{
   .checkout-index-index .page-footer{