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

This commit is contained in:
Michael RICOIS 2017-12-18 15:53:57 +01:00
commit 15ac61838b
3 changed files with 6 additions and 8 deletions

View File

@ -1679,7 +1679,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,
@ -1693,9 +1693,9 @@ body#category .sale_title, body#product .sale_title {
body#product .sale_title span:nth-child(2) {
display: inline-block;
width: 83%;
height: 40px;
line-height: 17px;
line-height: 19px;
padding-left: 15px;
vertical-align: middle;
}
body#category .sale_title span:nth-child(2) {
text-align: center;

View File

@ -39,7 +39,7 @@
<div class="right_block">
<div class="list-product-name">
<a class="" href="{$product.link|escape:'htmlall':'UTF-8'}" title="{$product.name|escape:'htmlall':'UTF-8'}">
<h3>{$product.name|truncate:37:'...'}</h3>
<h3>{$product.name|truncate:64:'...'|escape:'htmlall':'UTF-8'}</h3>
</a>
<div class="list-product-price">
{if (!$PS_CATALOG_MODE AND ((isset($product.show_price) && $product.show_price) || (isset($product.available_for_order) && $product.available_for_order)))}

View File

@ -102,16 +102,14 @@ var oneQuantityAvailableSentence = '{l s='Warning: 1 item in stock!' js=1}';
<h1 class="title sale_title">
{if isset($smarty.server.HTTP_REFERER) && preg_replace('#^https?://[^/]+/#', '/', $smarty.server.HTTP_REFERER) != $request_uri}
<span class="gradient">
<a href="{if $back_category>0}javascript:history.back(){else}{$link_back|escape:'htmlall':'UTF-8'}{/if}" class="button_small back" title="{l s='Back'}">{l s='Back'}</a>
<a href="{if $back_category > 0}javascript:history.back(){else}{$link_back|escape:'htmlall':'UTF-8'}{/if}" class="button_small back" title="{l s='Back'}">{l s='Back'}</a>
</span>
{/if}
<span>{$product->name|truncate:30:'...':true:false}</span>
<span>{$product.name|truncate:64:'...'|escape:'htmlall':'UTF-8'}</span>
</h1>
</div>
<div id="primary_block" class="clearfix">
{if isset($adminActionDisplay) && $adminActionDisplay}
<div id="admin-action">