antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop

Browse Source
This commit is contained in:
root 2017-07-04 10:46:45 +02:00
commit 5d9890c278
4 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/privatesales_similarproducts/front_similarproducts.tpl
View File

@ -21,8 +21,9 @@
<img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'medium')}" alt="{$product.legend|escape:'htmlall':'UTF-8'}" /> <img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'medium')}" alt="{$product.legend|escape:'htmlall':'UTF-8'}" />
</div> </div>
<div class="info_sellers"> <div class="info_sellers">
<p class="price">{$product.price}</p> {* <p class="price"></p> *}
<p class="price_info"> <p class="price_info">
<span class="price">{$product.price}</span>
<span class="old_price">{convertPrice price=$product.price_without_reduction}</span> <span class="old_price">{convertPrice price=$product.price_without_reduction}</span>
{if $product.specific_prices.reduction_type =='percentage'} {if $product.specific_prices.reduction_type =='percentage'}
{assign var="reduc_value" value=$product.specific_prices.reduction * 100} {assign var="reduc_value" value=$product.specific_prices.reduction * 100}
@ -46,7 +47,7 @@ $(document).ready(function(){
var list_items = frame.find('ul'); var list_items = frame.find('ul');
var nb_items = list_items.find('li').length; var nb_items = list_items.find('li').length;
if (nb_items>3) { if (nb_items>6) {
// adjust css // adjust css
frame.css({ frame.css({

20
themes/site/css/style.css
View File

@ -6978,7 +6978,7 @@ table#carrierTable tbody td {
box-sizing: border-box; box-sizing: border-box;
max-height: 300px; max-height: 300px;
background: #fff; background: #fff;
margin: 0 10px 0 10px; margin: 0 10px 5px 10px;
display:inline-block; display:inline-block;
-moz-box-shadow: 0px 0px 5px 1px #cccccc; -moz-box-shadow: 0px 0px 5px 1px #cccccc;
@ -7017,11 +7017,17 @@ table#carrierTable tbody td {
height: 100%; height: 100%;
} }
#product #privatesales_similarproduct ul li .hover-slide a.add-to-cart { #product #privatesales_similarproduct ul li .hover-slide a.add-to-cart {
background: url("../img/panier2_white.png") no-repeat center center;
}
#product #privatesales_similarproduct ul li .hover-slide a.add-to-cart:hover {
background: url("../img/panier2.png") no-repeat center center; background: url("../img/panier2.png") no-repeat center center;
} }
#product #privatesales_similarproduct ul li .hover-slide a.see-product { #product #privatesales_similarproduct ul li .hover-slide a.see-product {
background: url("../img/loupe.png") no-repeat center center; background: url("../img/loupe.png") no-repeat center center;
} }
#product #privatesales_similarproduct ul li .hover-slide a.see-product:hover {
background: url("../img/loupe_pink.png") no-repeat center center;
}
#product #privatesales_similarproduct ul li:after{ #product #privatesales_similarproduct ul li:after{
content: ''; content: '';
@ -7040,12 +7046,12 @@ table#carrierTable tbody td {
} }
#product #privatesales_similarproduct ul li .info_sellers { #product #privatesales_similarproduct ul li .info_sellers {
background: #fff; background: #fff;
background-color: #E4E4EE; /*background-color: #E4E4EE;*/
padding: 10px 10px; padding: 10px 10px;
box-sizing: border-box; box-sizing: border-box;
} }
#product #privatesales_similarproduct ul li .product_link_sellers, #product #privatesales_similarproduct ul li .product_link_sellers,
#product #privatesales_similarproduct ul li .info_sellers p.price, #product #privatesales_similarproduct ul li .info_sellers span.price,
#product #privatesales_similarproduct ul li .info_sellers .old_price, #product #privatesales_similarproduct ul li .info_sellers .old_price,
#product #privatesales_similarproduct ul li .info_sellers .percentage, #product #privatesales_similarproduct ul li .info_sellers .percentage,
#product #privatesales_similarproduct ul li .info_sellers .amount{ #product #privatesales_similarproduct ul li .info_sellers .amount{
@ -7086,10 +7092,10 @@ table#carrierTable tbody td {
#product #privatesales_similarproduct ul li .info_sellers p { #product #privatesales_similarproduct ul li .info_sellers p {
margin:0px; margin:0px;
} }
#product #privatesales_similarproduct ul li .info_sellers p.price { #product #privatesales_similarproduct ul li .info_sellers span.price {
border:0; border:0;
padding-top: 0px; padding-top: 0px;
color: #FB69AA; color: #70BC2C;
font-size: 16px; font-size: 16px;
} }
#product #privatesales_similarproduct ul li .info_sellers .price_info { #product #privatesales_similarproduct ul li .info_sellers .price_info {
@ -7102,7 +7108,9 @@ table#carrierTable tbody td {
padding:0px; padding:0px;
margin:0px; margin:0px;
} }
#product #privatesales_similarproduct ul li .info_sellers .price_info .percentage, #product #privatesales_similarproduct ul li .info_sellers .price_info .percentage{
color: #FB69AA;
}
#product #privatesales_similarproduct ul li .info_sellers .price_info .amount{ #product #privatesales_similarproduct ul li .info_sellers .price_info .amount{
color: #4F4E9A; color: #4F4E9A;
} }

BIN
themes/site/img/loupe_pink.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
themes/site/img/panier2_white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB