Merge branch 'ticket-12868-WhiteBG' into develop

This commit is contained in:
Marion Muszynski 2017-10-19 16:35:25 +02:00
commit e6452dbab7
5 changed files with 8 additions and 10 deletions

View File

@ -4852,7 +4852,7 @@ body.vp-maman, #index.logged.vp-maman {
padding-bottom: 5px;
}
#footer #paiement_logo_block_left a.payment {
width: 386px;
width: 430px;
}
#footer #paiement_logo_block_left a {
float: left;
@ -7479,7 +7479,8 @@ div.addresses ul.address,
.block-paypal,
.ant_support .section-help,
#cms #center_column .rte,
#contact-form form{
#contact-form form,
.ajax_block_product{
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
@ -7546,7 +7547,4 @@ div.addresses ul.address.item {
}
.ant_support{
padding:0px!important;
}
#left_column .informations_block_left{
background: #f6f6f6;
}
}

BIN
themes/site/img/bg_footer_bloc.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 16 KiB

View File

@ -1,5 +1,5 @@
/*
* 2007-2011 PrestaShop
* 2007-2011 PrestaShop
*
* NOTICE OF LICENSE
*
@ -30,7 +30,7 @@ function ps_round(value, precision)
roundMode = 2;
if (typeof(precision) == 'undefined')
precision = 2;
method = roundMode;
if (method == 0)
return ceilf(value, precision);
@ -179,7 +179,7 @@ function print_r(arr, level)
level_padding += " ";
if (typeof(arr) == 'object')
{ //Array/Hashes/Objects
{ //Array/Hashes/Objects
for (var item in arr)
{
var value = arr[item];
@ -222,5 +222,5 @@ function resizeAddressesBox(nameBox)
if (maxHeight < currentHeight)
maxHeight = currentHeight;
});
$(nameBox).height(maxHeight);
$(nameBox).height(maxHeight+10);
}