From 3f98533689012c9bb690d98e8bbe53ec3d8d0644 Mon Sep 17 00:00:00 2001
From: Michael RICOIS <ricois@antadis.com>
Date: Fri, 19 Jan 2018 11:22:07 +0100
Subject: [PATCH] Rebase and fix

---
 themes/site_mobile/css/style.css | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/themes/site_mobile/css/style.css b/themes/site_mobile/css/style.css
index 2c6ab150..b9dfb105 100755
--- a/themes/site_mobile/css/style.css
+++ b/themes/site_mobile/css/style.css
@@ -1670,6 +1670,7 @@ body#category .sale_title, body#product .sale_title {
 	padding: 10px 0px;
 	border-top: 1px solid #e4e4e4;
 	border-bottom: 1px solid #e4e4e4;
+	padding: 10px 0px;
 	text-align: left;
     clear:both;
 }
@@ -1679,7 +1680,7 @@ body#category .sale_title, body#product .sale_title {
 		display: inline-block;
 		height: 40px;
 		width: 15%;
-		vertical-align: top;
+		vertical-align: middle;
 		border: 0;
 	}
 		body#category .sale_title .gradient a.back,
@@ -1808,9 +1809,6 @@ body#order table#cart_summary tbody tr.cart_item .cart_description h5 a{
 body#category ul#product_list li div.list-product-price{
 	font-size:12px;
 	padding:0px 2% 0px 4%;
-	position: absolute;
-	bottom: 10px;
-	width: 100%;
 }
 body#category ul#product_list li div.list-product-price span.old_price{
 	display:block;
@@ -5350,22 +5348,12 @@ body#order-detail table#order-product tbody tr.item tr.title span.quantity{
   height: 30px;
   width: 100%; 
 }
-<<<<<<< Upstream, based on origin/master
+
 #product_list li div.expresscart_container {
 	float: right;
 }
+
 #product_list li div.expresscart_container a.button.expresscart {
-	padding-left: 36px;
-	background: url("../img/add_to_cart.png") no-repeat left center #fb66a9;
-	height: 32px;
-	width: 38px;
-	display: block;
-	position: absolute;
-	bottom: 12px;
-	border-radius: 20px;
-	right: 0;
-=======
-#product_list li div.right_block a.button.expresscart{
   padding-left: 36px;
   background: url("../img/add_to_cart.png") no-repeat left center #fb66a9;
   background-size: 38px 32px;
@@ -5373,8 +5361,8 @@ body#order-detail table#order-product tbody tr.item tr.title span.quantity{
   width: 38px;
   display: block;
   position: absolute;
-  bottom: 4px; 
+  bottom: 12px;
   border-radius: 20px;
->>>>>>> ab90b92 Change image - better quality
+  right: 0;
   z-index: 10000;
 }