fix conflict

This commit is contained in:
Marion Muszynski 2017-10-12 09:58:55 +02:00
commit abd2344c77

View File

@ -1699,7 +1699,7 @@ body#page-404 .footer_links {
background-color: #b5b1b1;
}
#category .content #product_list .view_button:hover{ background-color: #f45bb7;}
#category .content #product_list .view_button:hover{ background-color: #fb66a9;}
#header {
position: absolute;
@ -6451,11 +6451,17 @@ table#carrierTable tbody td {
height: 100%;
}
#product #best-sellers_block_product .slider_sales_product_footer .slides li .hover-slide a.add-to-cart {
background: url("../img/panier2_white.png") no-repeat center center;
}
#product #best-sellers_block_product .slider_sales_product_footer .slides li .hover-slide a.add-to-cart:hover {
background: url("../img/panier2.png") no-repeat center center;
}
#product #best-sellers_block_product .slider_sales_product_footer .slides li .hover-slide a.see-product {
background: url("../img/loupe.png") no-repeat center center;
}
#product #best-sellers_block_product .slider_sales_product_footer .slides li .hover-slide a.see-product:hover {
background: url("../img/loupe_pink.png") no-repeat center center;
}
#product #best-sellers_block_product .slider_sales_product_footer .slides li:after{
content: '';
display: block;