Merge branch 'ticket-blockOrderSummary' into develop

This commit is contained in:
Marion Muszynski 2016-07-25 11:18:16 +02:00
commit f1769755de
2 changed files with 10 additions and 1 deletions

View File

@ -14,7 +14,7 @@
</div>
<div>
<h5>{l s='Shipping' mod='blockordersummary'}</h5>
<p>{$carrier_name} <span class="price price_total">{convertPrice price=$cart->getOrderTotal(TRUE, 5)}</span></p>
<p class="carrier-info"><span class='carrier-name'>{$carrier_name}</span> <span class="price price_total">{convertPrice price=$cart->getOrderTotal(TRUE, 5)}</span></p>
</div>
<div>
<h5>{l s='Delivery delays' mod='blockordersummary'}</h5>

View File

@ -6713,6 +6713,15 @@ table#carrierTable tbody td {
#blockordersummary p {
margin-bottom: 5px;
}
#blockordersummary p.carrier-info:after{
content: '';
display: block;
clear: both;
}
#blockordersummary span.carrier-name {
float: left;
max-width: 130px;
}
#blockordersummary p.delivery-delay {
color: #e36ea2;
font-weight: 600;