diff --git a/themes/site/css/style.css b/themes/site/css/style.css index 3e284298..365d650a 100755 --- a/themes/site/css/style.css +++ b/themes/site/css/style.css @@ -2769,12 +2769,12 @@ div.addresses ul.address li.address_title { } #product_list li div.right_block a.button.expresscart{ padding-left: 50px; - /* background: url('../img/achat_express.jpg') left center no-repeat #504d8b; */ background: url("../img/add_to_cart.jpg") no-repeat left center #504d8b; + background-size: 38px 32px; } #product_list li div.right_block a.button.expresscart:hover{ - /* background: url('../img/achat_express.jpg') left center no-repeat #f45bb7; */ background: url("../img/add_to_cart.jpg") no-repeat left center #fb66a9; + background-size: 38px 32px; } #product_list li div.right_block a.button:hover, .product_list li div.right_block a.button:hover { background: #e26ea2; diff --git a/themes/site/img/add_to_cart.png b/themes/site/img/add_to_cart.png index 054a4b9c..1fb93c06 100644 Binary files a/themes/site/img/add_to_cart.png and b/themes/site/img/add_to_cart.png differ diff --git a/themes/site_mobile/css/style.css b/themes/site_mobile/css/style.css index 788c1642..2c6ab150 100755 --- a/themes/site_mobile/css/style.css +++ b/themes/site_mobile/css/style.css @@ -5350,6 +5350,7 @@ 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; } @@ -5363,5 +5364,17 @@ body#order-detail table#order-product tbody tr.item tr.title span.quantity{ 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; + height: 32px; + width: 38px; + display: block; + position: absolute; + bottom: 4px; + border-radius: 20px; +>>>>>>> ab90b92 Change image - better quality z-index: 10000; } diff --git a/themes/site_mobile/img/add_to_cart.png b/themes/site_mobile/img/add_to_cart.png index 054a4b9c..1fb93c06 100644 Binary files a/themes/site_mobile/img/add_to_cart.png and b/themes/site_mobile/img/add_to_cart.png differ