Merge branch 'ticket-12189-fixColorExpressCart' into develop

This commit is contained in:
Marion Muszynski 2017-01-09 11:19:54 +01:00
commit c85d102c06
2 changed files with 6 additions and 5 deletions

View File

@ -70,7 +70,8 @@
margin : 20px 0;
padding : 10px 20px 5px 10px;
width : 220px;
background : #DEA4BE;
/*background : #DEA4BE;*/
background : #fb66a9;
float : left;
}
.center_element img {
@ -168,7 +169,7 @@
text-decoration: line-through;
}
p.price .our_price_display {
color: #E36EA2;
color: #fb66a9;
font-weight: bold;
font-style: normal;
}
@ -390,7 +391,7 @@
var quantityAvailableSentence = '{l s='Warning: X items in stock!' mod='expresscart' js=1}';
var oneQuantityAvailableSentence = '{l s='Warning: 1 item in stock!' mod='expresscart' js=1}';
{if isset($groups)}
// Combinations
{foreach from=$combinations key=idCombination item=combination}

View File

@ -71,8 +71,8 @@
margin : 10px 0;
padding : 10px ;
width : 320px;
background : #DEA4BE;
/* background : #fb66a9; */
/*background : #DEA4BE;*/
background : #fb66a9;
float : left;
box-sizing: border-box;
height: 133px;