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

Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/toutpratique.git into develop

Browse Source
This commit is contained in:
Michael RICOIS 2017-06-15 16:22:51 +02:00
commit eaf6d4fc1f
5 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
themes/toutpratique/css/global.css
View File

@ -616,7 +616,6 @@ body.content_only { margin: 0 }
border-bottom: 3px solid #333333;
padding-bottom: 10px;
}
#index #best_sales h2:not(.title) {display: none;}
#index .line { margin-top: 15px; }
#index #best_sales .pub {
border-color: #d6d6d6;
@ -3362,7 +3361,7 @@ main#categorycms { margin-bottom: 30px }
}
.manufacturer_block a.btn-manufacturer { margin-top: 15px; }
#best_sales h2 {
#best_sales .title {
text-align: center;
margin-bottom: 30px;
font-size: 36px;
@ -4076,6 +4075,7 @@ main#categorycms { margin-bottom: 30px }
text-align: center;
z-index: 5;
}
#product #image-block .product-failling-label,
#product #image-block .product-new-label {
background: #529bb6;
color: #fff;

8
themes/toutpratique/css/k2000.css
View File

@ -571,16 +571,16 @@ header.page-heading.order-process { padding: 25px 0 0 0 }
height: 40px;
}
.product-container .product-infos h5.product-name {
.product-container .product-infos .product-name {
display: block;
font-family: 'pt_sans';
font-size: 14px;
height: 45px;
}
.product-container .border .product-infos h5.product-name a {
.product-container .border .product-infos .product-name a {
color: #333;
}
.product-container .border:hover .product-infos h5.product-name a { text-decoration: none; }
.product-container .border:hover .product-infos .product-name a { text-decoration: none; }
.product-container .border .product-infos .price {
color: #303030;
font-family: 'vidaloka';
@ -612,7 +612,7 @@ header.page-heading.order-process { padding: 25px 0 0 0 }
#layer_cart .layer_cart_product .product-infos .product-image-container img{ width: 80%; display: inline !important}
#layer_cart .bg{ padding-bottom: 10px; }
.product-container .product-infos { position: static}
.product-container .product-infos h5.product-name{ height: auto;}
.product-container .product-infos .product-name{ height: auto;}
.product-container .product-price { height: auto; margin-bottom: 10px; }
.crossseling {

1
themes/toutpratique/modules/blockbestsellers/blockbestsellers-home.tpl
View File

@ -1,4 +1,3 @@
<h2>{l s='Produits les plus populaires' mod='blockbestsellers'}</h2>
{if isset($best_sellers) && $best_sellers}
{include file="$tpl_dir./product-list-blocs.tpl" products=$best_sellers class='blockbestsellers tab-pane' id='blockbestsellers' position=2 position_sm=4}
{else}

2
themes/toutpratique/modules/blockbestsellers/blockbestsellers-store.tpl
View File

@ -1,4 +1,4 @@
<h2>{l s='Produits les plus populaires' mod='blockbestsellers'}</h2>
<h2 class="title">{l s='Produits les plus populaires' mod='blockbestsellers'}</h2>
{if isset($best_sellers) && $best_sellers}
{include file="$tpl_dir./product-list-blocs.tpl" products=$best_sellers class='blockbestsellers tab-pane' id='blockbestsellers' position=2 position_sm=4}
{else}

5
themes/toutpratique/product.tpl
View File

@ -218,10 +218,9 @@
<div class="content_prices clearfix">
{if $product->on_sale && !$isFlash}
<span class="solde">{l s='En solde !'}</span>
{/if}
{if $percentReduction}
{else if $percentReduction}
<span class="price-percent-reduction">{if $isFlash}{l s='Vente Flash'}{else}{l s='Promo'}{/if} | -{$percentReduction}%</span>
{/if}
{/if}
{if $product->show_price && !isset($restricted_country_mode) && !$PS_CATALOG_MODE}
<!-- prices -->
<div>