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

Merge branch 'ticket-fidelite' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2016-04-25 16:05:33 +02:00
commit 423b9fbcc0
2 changed files with 103 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
themes/site_mobile/css/style.css
View File

@ -4477,3 +4477,103 @@ body#index .jqibuttons span.gradient{
line-height: 25px;
padding: 10px;
}
#block-history{
background: #fff;
padding: 10px;
-webkit-box-shadow: 0 5px 3px -3px #ccc;
-moz-box-shadow: 0 5px 3px -3px #ccc;
box-shadow: 0 5px 3px -3px #ccc;
}
#block-history .alternate_item.even{
background: #F3F3F3;
}
#module-loyalty-loyalty-program div.pagination{
margin-top: 20px;
}
#module-loyalty-loyalty-program ul.pagination {
list-style: none;
text-align: center;
}
#module-loyalty-loyalty-program ul.pagination li{
/* float: left; */
display: inline-block;
position: relative;
margin-right: 10px;
background: #fff;
-moz-border-radius: 50%;
-webkit-border-radius: 50%;
border-radius: 50%;
font-family: georgia, times new roman, serif;
font-style: italic;
color: #504d8b;
min-width: 26px;
text-align: center;
font-size: 22px;
line-height: 26px;
}
#module-loyalty-loyalty-program ul.pagination li.current,
#module-loyalty-loyalty-program ul.pagination li#pagination_previous,
#module-loyalty-loyalty-program ul.pagination li#pagination_next {
background: #504d8b;
color: #fff;
}
#module-loyalty-loyalty-program ul.pagination li span{
font-size: 22px;
color: #fff;
width: 100%;
}
#module-loyalty-loyalty-program ul.pagination li#pagination_previous.disabled,
#module-loyalty-loyalty-program ul.pagination li#pagination_next.disabled {
background: #fff;
}
#module-loyalty-loyalty-program ul.pagination:after{
content: '';
clear: both;
display: block;
}
#module-loyalty-loyalty-program table,
#module-loyalty-loyalty-program thead,
#module-loyalty-loyalty-program tfoot,
#module-loyalty-loyalty-program tbody,
#module-loyalty-loyalty-program tr{
display: block;
padding: 0px;
}
#module-loyalty-loyalty-program tr{
padding: 5px 0;
}
#module-loyalty-loyalty-program thead th {
padding: 0 5px;
}
#module-loyalty-loyalty-program td,
#module-loyalty-loyalty-program th {
border:none;
text-align: center;
width: 25%;
padding: 0;
}
#module-loyalty-loyalty-program td.history_method{
min-width: 50px;
}
#module-loyalty-loyalty-program p.total-discount{
text-align: center;
}
#module-loyalty-loyalty-program p span.total-discount-loyalty{
text-align: center;
text-transform: none;
border: 0px;
color: #FFF;
padding: 5px 10px 5px 10px;
text-decoration: none;
font-weight: normal;
/* background: #504d8b url("../img/arrow.png") right 9px no-repeat; */
background: #504d8b;
-moz-border-radius: 20px;
-webkit-border-radius: 20px;
border-radius: 20px;
font-family: georgia, times new roman, serif;
font-style: italic;
font-size: 13px;
}

5
themes/site_mobile/modules/loyalty/loyalty.tpl
View File

@ -41,13 +41,13 @@
<th class="last_item">{l s='Points Status' mod='loyalty'}</th>
</tr>
</thead>
<tfoot>
{*<tfoot>
<tr class="alternate_item">
<td colspan="2" class="history_method bold" style="text-align:right;">{l s='Total discount available:' mod='loyalty'}</td>
<td class="history_method" style="text-align:left;"><span class='total-discount-loyalty'>{Tools::displayPrice($voucher)}</span></td>
<td class="history_method">&nbsp;</td>
</tr>
</tfoot>
</tfoot>*}
<tbody>
{foreach from=$displayorders item='order' name=orders}
{if $order.id_loyalty_state == 3}
@ -63,6 +63,7 @@
</tbody>
</table>
<div id="block-order-detail" class="hidden">&nbsp;</div>
<p class='total-discount'>{l s='Total discount available: ' mod='loyalty'}<span class='total-discount-loyalty'>{Tools::displayPrice($voucher)}</span></p>
{else}
<p class="warning">{l s='You have not placed any orders.'}</p>
{/if}