Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
This commit is contained in:
Christophe Latour
commit
ea5d7238b2
@ -8,6 +8,15 @@
|
||||
font-weight: normal;
|
||||
font-style: normal;
|
||||
}
|
||||
@font-face {
|
||||
font-family: 'Montserrat-Regular';
|
||||
src: url('../fonts/Montserrat-Regular.eot?#iefix') format('embedded-opentype'),
|
||||
url('../fonts/Montserrat-Regular.woff') format('woff'),
|
||||
url('../fonts/Montserrat-Regular.ttf') format('truetype'),
|
||||
url('../fonts/Montserrat-Regular.svg#Montserrat-Regular') format('svg');
|
||||
font-weight: normal;
|
||||
font-style: normal;
|
||||
}
|
||||
|
||||
#soFr{
|
||||
overflow: auto;
|
||||
@ -1725,7 +1734,7 @@ body#category ul#product_list li{
|
||||
margin:0px;
|
||||
display:block;
|
||||
position:relative;
|
||||
border-bottom:4px solid #cccccc;
|
||||
border-bottom: 3px solid #efefef;
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
body#category ul#product_list li.out{
|
||||
@ -1734,17 +1743,18 @@ body#category ul#product_list li.out{
|
||||
body#category ul#product_list li div.left_block,
|
||||
body#category ul#product_list li div.right_block{
|
||||
display:inline-block;
|
||||
width:50%;
|
||||
width:75%;
|
||||
margin:0px;
|
||||
padding:0px;
|
||||
height:180px;
|
||||
height:90px;
|
||||
float:left;
|
||||
min-height:150px;
|
||||
max-height:150px;
|
||||
min-height:90px;
|
||||
max-height:90px;
|
||||
}
|
||||
body#category ul#product_list li div.left_block{
|
||||
text-align:center;
|
||||
border-right: 1px solid #e4e4e4;
|
||||
/*border-right: 1px solid #e4e4e4;*/
|
||||
width:25%;
|
||||
}
|
||||
body#category ul#product_list li div.left_block img{
|
||||
position:relative;
|
||||
@ -1781,6 +1791,11 @@ body#category ul#product_list li div.list-product-name h3 {
|
||||
body#category ul#product_list li div.list-product-name h3 {
|
||||
padding-right: 0;
|
||||
max-height: 65px;
|
||||
font-family: 'Montserrat-Regular';
|
||||
padding: 0px 2% 0px 4%;
|
||||
font-size:12px;
|
||||
color:#333;
|
||||
font-style: normal;
|
||||
}
|
||||
body#order table#cart_summary tbody tr.cart_item .cart_description h5{
|
||||
padding:0px 1% 0px 0%;
|
||||
@ -1793,6 +1808,8 @@ body#order table#cart_summary tbody tr.cart_item .cart_description h5 a{
|
||||
body#category ul#product_list li div.list-product-price{
|
||||
font-size:12px;
|
||||
padding:0px 2% 0px 4%;
|
||||
position: absolute;
|
||||
bottom: 10px;
|
||||
}
|
||||
body#category ul#product_list li div.list-product-price span.old_price{
|
||||
display:block;
|
||||
@ -1833,17 +1850,29 @@ body#category ul#product_list li div.list-product-price span.price{
|
||||
margin-bottom: 3px;
|
||||
display: block;
|
||||
}
|
||||
body#category ul#product_list li div.list-product-price span.price{
|
||||
color:#7DC668;
|
||||
font-family: 'Montserrat-Regular';
|
||||
font-size: 14px;
|
||||
}
|
||||
body#category ul#product_list li div.list-product-price span.reduction{
|
||||
font-family:georgia;
|
||||
color:#565485;
|
||||
/*color:#565485;*/
|
||||
color:#F45BB7;
|
||||
font-size:14px;
|
||||
top: 4px;
|
||||
/*top: 4px;*/
|
||||
position: relative;
|
||||
display: inline-block;
|
||||
vertical-align: middle;
|
||||
}
|
||||
body#category ul#product_list li div.list-product-price span.old_price{
|
||||
/*font-family:georgia;*/
|
||||
color:#9c9c9c;
|
||||
font-size:11px;
|
||||
display: inline-block;
|
||||
vertical-align: middle;
|
||||
margin-right: 5px;
|
||||
text-decoration: line-through;
|
||||
}
|
||||
/* PRODUCT */
|
||||
|
||||
|
||||
BIN
themes/site_mobile/fonts/Montserrat-Regular.eot
Normal file
BIN
themes/site_mobile/fonts/Montserrat-Regular.eot
Normal file
Binary file not shown.
1743
themes/site_mobile/fonts/Montserrat-Regular.svg
Normal file
1743
themes/site_mobile/fonts/Montserrat-Regular.svg
Normal file
File diff suppressed because it is too large
Load Diff
|
After Width: | Height: | Size: 104 KiB |
BIN
themes/site_mobile/fonts/Montserrat-Regular.ttf
Normal file
BIN
themes/site_mobile/fonts/Montserrat-Regular.ttf
Normal file
Binary file not shown.
BIN
themes/site_mobile/fonts/Montserrat-Regular.woff
Normal file
BIN
themes/site_mobile/fonts/Montserrat-Regular.woff
Normal file
Binary file not shown.
@ -21,30 +21,30 @@
|
||||
{convertPrice price=$product.price_tax_exc}
|
||||
{/if}
|
||||
</span>
|
||||
{/if}
|
||||
{if $product.price_without_reduction!=$product.price}
|
||||
<span class="old_price">{l s='instead of'} {convertPrice price=$product.price_without_reduction}</span>
|
||||
{if $product.reduction>0 && $product.price_without_reduction!=$product.price}
|
||||
<span class="old_price">{convertPrice price=$product.price_without_reduction}</span>
|
||||
{/if}
|
||||
{assign var=product_reduction value=($product.reduction * (1 + $product.rate / 100) * 100 / $product.price_without_reduction)}
|
||||
{if $product_reduction>0}
|
||||
<span class="reduction">(-{$product_reduction|round|string_format:'%d'}%)</span>
|
||||
{if isset($product.quantity_all_versions) && $product.quantity_all_versions <= $last_qties && $product.quantity_all_versions > 0}
|
||||
<div class="productQuantityAlert">
|
||||
{if $product.quantity_all_versions == 1}
|
||||
<p>{l s='Warning: 1 item in stock!' mod='categoryscroll'}</p>
|
||||
{else}
|
||||
<p>{l s='Warning :' mod='categoryscroll'} {$product.quantity_all_versions} {l s='items in stock' mod='categoryscroll'}</p>
|
||||
{/if}
|
||||
</div>
|
||||
{elseif !isset($product.quantity_all_versions) && $product.quantity <= $last_qties && $product.quantity > 0}
|
||||
<div class="productQuantityAlert">
|
||||
{if $product.quantity == 1}
|
||||
<p>{l s='Warning: 1 item in stock!' mod='categoryscroll'}</p>
|
||||
{else}
|
||||
<p>{l s='Warning :' mod='categoryscroll'} {$product.quantity} {l s='items in stock' mod='categoryscroll'}</p>
|
||||
{/if}
|
||||
</div>
|
||||
{/if}
|
||||
{/if}
|
||||
{if isset($product.quantity_all_versions) && $product.quantity_all_versions <= $last_qties && $product.quantity_all_versions > 0}
|
||||
<div class="productQuantityAlert">
|
||||
{if $product.quantity_all_versions == 1}
|
||||
<p>{l s='Warning: 1 item in stock!' mod='categoryscroll'}</p>
|
||||
{else}
|
||||
<p>{l s='Warning :' mod='categoryscroll'} {$product.quantity_all_versions} {l s='items in stock' mod='categoryscroll'}</p>
|
||||
{/if}
|
||||
</div>
|
||||
{elseif !isset($product.quantity_all_versions) && $product.quantity <= $last_qties && $product.quantity > 0}
|
||||
<div class="productQuantityAlert">
|
||||
{if $product.quantity == 1}
|
||||
<p>{l s='Warning: 1 item in stock!' mod='categoryscroll'}</p>
|
||||
{else}
|
||||
<p>{l s='Warning :' mod='categoryscroll'} {$product.quantity} {l s='items in stock' mod='categoryscroll'}</p>
|
||||
{/if}
|
||||
</div>
|
||||
{/if}
|
||||
{/if}
|
||||
{/if}
|
||||
{* <span class="gradient">
|
||||
|
||||
@ -49,8 +49,8 @@
|
||||
{convertPrice price=$product.price_tax_exc}
|
||||
{/if}
|
||||
</span>
|
||||
{if $product.price_without_reduction!=$product.price}
|
||||
<span class="old_price">{l s='instead of'} {convertPrice price=$product.price_without_reduction}</span>
|
||||
{if $product.reduction>0 && $product.price_without_reduction!=$product.price}
|
||||
<span class="old_price">{convertPrice price=$product.price_without_reduction}</span>
|
||||
{/if}
|
||||
{assign var=product_reduction value=($product.reduction * (1 + $product.rate / 100) * 100 / $product.price_without_reduction)}
|
||||
{if $product_reduction>0}
|
||||
@ -75,7 +75,7 @@
|
||||
{/if}
|
||||
{/if}
|
||||
{/if}
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user