Merge branch 'ticket-consumable' into develop

This commit is contained in:
Marion Muszynski 2016-04-15 11:46:36 +02:00
commit 92e77117f8
3 changed files with 4 additions and 3 deletions

View File

@ -1,6 +1,6 @@
{if $sale}
{if $consumable}
<div id="sale_end"></div>
<div id="sale_end" class="consumable"></div>
{else}
<div id="sale_end">
{l s='This sale ends in' mod='privatesales_countdown'} <span id="countdown"></span>

View File

@ -1565,7 +1565,8 @@ body#product div#sale_end{
body#product div#sale_end #countdown{
color: #e36ea2;
}
#sale_end.consumable{
body#category #sale_end.consumable,
body#product #sale_end.consumable{
background: none;
padding: 0;
}

View File

@ -1,6 +1,6 @@
{if $sale}
{if $consumable}
<div id="sale_end"></div>
<div id="sale_end" class="consumable"></div>
{else}
<div id="sale_end">
{l s='This sale ends in' mod='privatesales_countdown'} <span id="countdown"></span>