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

fix conflicts

Browse Source
This commit is contained in:
Marion Muszynski 2017-11-06 11:58:06 +01:00
commit a53ea90104
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7480,7 +7480,9 @@ div.addresses ul.address,
.ant_support .section-help,
#cms #center_column .rte,
#contact-form form,
.ajax_block_product{
.ajax_block_product,
#order_conf_detail .detail_invoice,
#order_conf_detail .detail_delivery,{
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
@ -7529,6 +7531,9 @@ div.addresses ul.address,
#after_cart_summary{
margin-top: 20px;
}
#order_conf_detail #order-detail-content{
margin-bottom: 20px;
}
div.addresses ul.address.item {
margin-left: 2px;
}

BIN
themes/site/img/hp.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 188 KiB

After

Width:  |  Height:  |  Size: 114 KiB

BIN
themes/site_mobile/img/mtn.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 100 KiB

After

Width:  |  Height:  |  Size: 159 KiB

6
tools/swift/Swift/Message/Headers.php
View File

@ -420,8 +420,10 @@ class Swift_Message_Headers
if (false !== $p = strpos($encoded_value[$key], $this->LE))
{
$encoded_value[$key] = preg_replace_callback("/<([^>]+)>/", function($matches) {
return str_replace($this->LE, '', $matches[1]);
// $cb = 'str_replace("' . $this->LE . '", "", "<$1>");';
// $encoded_value[$key] = preg_replace("/<([^>]+)>/e", $cb, $encoded_value[$key]);
$encoded_value[$key] = preg_replace_callback('/<([^>]+)>/', function($matches) {
return str_replace($this->LE, '', '<' . $matches[1] . '>');
}, $encoded_value[$key]);
}