Merge branch 'mobile' into develop

This commit is contained in:
Nolwenn 2017-05-10 11:15:33 +02:00
commit c5ed75ed58
3 changed files with 4 additions and 11 deletions

View File

@ -1407,6 +1407,8 @@ body#index #columns #privatesales_block .delivery_delay{
top: 5px;
right:5px;
text-align: right;
max-width: 42px;
height: auto;
}
body#index #columns #privatesales_block .delivery_delay img{
width: 100%;

View File

@ -465,23 +465,14 @@ $(document).ready(function()
//add a link on the span 'view full size' and on the big image
$('span#view_full_size, div#image-block img').click(function(){
$('#views_block li a.shown').click();
$('#views_block li a.shown').fancybox({
$('#views_block li a.shown').click().fancybox({
'hideOnContentClick': true,
'transitionIn' : 'elastic',
'transitionOut' : 'elastic',
'onComplete' : function(){$('#views_block li a.shown').unbind('click.fb');}
});
});
// if($('.thickbox').length > 0) {
// $('.thickbox').fancybox({
// 'hideOnContentClick': true,
// 'transitionIn' : 'elastic',
// 'transitionOut' : 'elastic'
// });
// }
//catch the click on the "more infos" button at the top of the page
$('div#short_description_block p a.button').click(function(){

View File

@ -166,7 +166,7 @@ var oneQuantityAvailableSentence = '{l s='Warning: 1 item in stock!' js=1}';
</div>
{/if}
</div>
{if isset($images) && count($images) > 1}<p class="align_center clear"><span id="wrapResetImages" style="display: none;"><img src="{$img_dir}icon/cancel.png" alt="{l s='Cancel'}" /> <a id="resetImages" href="{$link->getProductLink($product)}" onclick="$('span#wrapResetImages').hide('slow');return (false);">{l s='Display all pictures'}</a></span></p>{/if}
{*{if isset($images) && count($images) > 1}<p class="align_center clear"><span id="wrapResetImages" style="display: none;"><img src="{$img_dir}icon/cancel.png" alt="{l s='Cancel'}" /> <a id="resetImages" href="{$link->getProductLink($product)}" onclick="$('span#wrapResetImages').hide('slow');return (false);">{l s='Display all pictures'}</a></span></p>{/if}*}
<!-- usefull links-->
{*<ul id="usefull_link_block">
{if $HOOK_EXTRA_LEFT}{$HOOK_EXTRA_LEFT}{/if}