Merge branch 'ticket-fidelite' into develop

This commit is contained in:
Marion Muszynski 2016-05-02 17:48:42 +02:00
commit 77f391e66d

View File

@ -5726,7 +5726,7 @@ div#giftvoucher_ask_infos_block .gv_customization > .gv_param input {
}
/** Module loyalty **/
#block-history{
#module-loyalty-loyalty-program #block-history{
background: #fff;
padding: 20px;
-moz-box-shadow: 2px 2px 5px #cccccc;
@ -5735,10 +5735,10 @@ div#giftvoucher_ask_infos_block .gv_customization > .gv_param input {
-o-box-shadow: 2px 2px 5px #cccccc;
box-shadow: 2px 2px 5px #CCC;
}
#block-history .alternate_item.even{
#module-loyalty-loyalty-program #block-history .alternate_item.even{
background: #F3F3F3;
}
a.loyalty-transform, .history_method span.total-discount-loyalty{
#module-loyalty-loyalty-program a.loyalty-transform, #module-loyalty-loyalty-program .history_method span.total-discount-loyalty{
text-align: center;
text-transform: none;
border: 0px;