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

fix conflict

Browse Source
This commit is contained in:
Romu 2016-12-23 02:01:30 -08:00
commit 78a7595e7f
5 changed files with 65 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
themes/toutpratique/css/global.css
View File

@ -2502,13 +2502,16 @@ main#categorycms { margin-bottom: 30px }
font-size: 14px;
}
#postedito .intro_post {
margin-top: 30px;
#postedito .article_content {
margin-top: 20px;
}
#postedito .intro_label {
font-size: 30px;
font-family: 'pt_sansbold';
}
#postedito .intro_post {
margin-bottom: 25px;
}
#postedito .pack_content {
margin-top: 15px;
border: 1px solid #dfdfdf;
@ -2518,10 +2521,12 @@ main#categorycms { margin-bottom: 30px }
/* background: #f1f1f1; */
}
#postedito .pack_content .image {
padding: 25px 0;
padding: 25px 15px;
}
#postedito .pack_content .image img {
margin: 0 auto;
}
#postedito .pack_content .content_product .link_name {
font-family: 'pt_sansbold';
@ -2673,7 +2678,9 @@ main#categorycms { margin-bottom: 30px }
display: inline-block;
margin: 0 10px;
}
@media (max-width: 990px) {
#postedito .pack { padding-top: 20px; }
}
@media(max-width: 500px) {
#search .anchor-search li { display: block; margin: 15px 0 0 0 }
#search .anchor-search li:first-child { margin: 0 }
@ -7622,3 +7629,20 @@ div.languages>span{
@media (max-width: 620px) {
.owl-controls { margin-top: -40px; }
}
/*****************************************/
/************* GO TO TOP *************/
#gototop {
bottom: 50px;
cursor: pointer;
opacity: 0.7;
position: fixed;
left: -200px;
-webkit-transition: all 0.3s ease-in-out 0s;
-o-transition: all 0.3s ease-in-out 0s;
transition: all 0.3s ease-in-out 0s;
z-index: 500
}
#gototop.active { left: 50px }
#gototop:hover { opacity: 1 }

4
themes/toutpratique/footer.tpl
View File

@ -168,6 +168,8 @@
};
</script>
<script type="text/javascript" src="https://app.getresponse.com/goals_log.js?p=711604&u=BWu1Z" async></script>
<div id="gototop">
<img src="{$img_dir}bt-haut.png" title="{l s='Go to top'}" />
</div>
</body>
</html>

BIN
themes/toutpratique/img/bt-haut.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

8
themes/toutpratique/js/global.js
View File

@ -194,6 +194,14 @@ $(document).ready(function() {
$('.search_category select[name="order_by"]').on('change', function(){
$('.search_category form').submit();
});
$(window).scroll(function() {
$(this).scrollTop() > 300 ? $('#gototop').addClass('active') : $('#gototop').removeClass('active');
});
$('#gototop').on('click', function() {
$('html, body').animate({ scrollTop: 0 }, 600);
});
});
function openPanel(){

102
themes/toutpratique/postedito.tpl
View File

@ -15,25 +15,43 @@
</div>
<main id="postedito" class="container">
<div class="row intro_post">
<div class="{if $product_relation}col-md-6 col-sm-6{else} col-md-12 col-sm-12{/if}">
<div class="row article_content">
<div class="col-md-2 menu_edito hidden-sm hidden-xs">
<ul>
<li><a href="/">{l s='Accueil'}</a></li>
<li><a href="{$link->getHomeStoreLink()}">{l s='La boutique'}</a></li>
<li><a href="{$link->getVideosLink()}">{l s='Les vidéos'}</a></li>
<li><a href="#">{l s='A propos'}</a></li>
</ul>
</div>
<div class="col-md-6">
<div class="intro_post">
<div class="">
<span class="intro_label">{l s='Introduction'}</span>
<div class="intro" itemprop="description">
{$edito->intro|escape:'UTF-8'|stripslashes}
</div>
</div>
{if $product_relation}
</div>
<div class="content">
{$edito->content}
</div>
</div>
<div class="col-md-4">
{if $product_relation}
<div class="col-md-6 col-sm-6">
<div >
<div class="pack">
<img src="{$img_dir}title_pack.png" class="img-responsive" alt="{l s='Le pack qui me sauve tout de suite'}">
<div class="pack_content">
<div class="product_top">
{assign var='product' value=$product_relation.0}
{assign var='id_image' value=Product::getCover($product->id)}
<div class="row">
<div class="clearfix">
<div class="col-md-4 col-xs-4 image">
{if $product->specific_prices.reduction_type == 'percentage'}
@ -72,78 +90,10 @@
</div>
</div>
</div>
{*<div class="stack animated">
<div class="pack">
<div class="pack_content">
<div class="product_top">
{assign var='product' value=$product_relation.0}
{assign var='id_image' value=Product::getCover($product->id)}
<div class="row">
<div class="col-md-2 col-xs-2 image">
<a href="{$link->getProductLink($product->id, $product->link_rewrite)}" title="{$product->name|escape:'html':'UTF-8'}" >
<img class="img-responsive" src="{$link->getImageLink($product->link_rewrite, $id_image.id_image, 'medium_default')|escape:'html':'UTF-8'}" alt="{$product->name|escape:'html':'UTF-8'}" title="{$product->name|escape:'html':'UTF-8'}" itemprop="image" />
</a>
</div>
<div class="col-md-10 col-xs-10 content_product">
<strong class="hidden-sm hidden-md hidden-lg">{l s='Le produit qui sauve'}</strong>
<a class="link_name" href="{$link->getProductLink($product->id, $product->link_rewrite)}" title="{$product->name|escape:'html':'UTF-8'}">{$product->name}</a>
<div class="valign-middle">
<div class="price">
{displayPrice price=$product->price}
{if isset($product->specific_prices) && $product->specific_prices && isset($product->specific_prices.reduction) && $product->specific_prices.reduction > 0}
<span class="old-price product-price">
{l s='au lieu de'} <span class="barre">{displayWtPrice p=$product->price_without_reduction}</span>
</span>
{/if}
</div>
<a class="btn ajax_add_to_cart_button" data-text="{l s='J\'achete'}" data-id-product="{$product->id}" data-minimal_quantity="1" onclick="trackConversion(`{CMSCategory::getNameStatic($post->id_category)}`, `Le produit qui me sauve`, `Ajout au panier depuis la page Astuce`);">
<i class="icon icon-shopping-cart"></i> <span>{l s='J\'achete'}</span>
</a>
</div>
</div>
</div>
</div>
<div class="reassurance">
<div class="reinsurance">
<div class="border bloc">
<span class="icon-logistics3"></span>{l s='Expédié sous 48h'}
</div>
</div>
</div>
</div>
</div>
</div>
*}
{/if}
</div>
<div class="separator">
<hr/>
</div>
<div class="row article_content">
<div class="col-md-2 menu_edito hidden-sm hidden-xs">
<ul>
<li><a href="/">{l s='Accueil'}</a></li>
<li><a href="{$link->getHomeStoreLink()}">{l s='La boutique'}</a></li>
<li><a href="{$link->getVideosLink()}">{l s='Les vidéos'}</a></li>
<li><a href="#">{l s='A propos'}</a></li>
</ul>
</div>
<div class="col-md-6">
<div class="content">
{$edito->content}
</div>
</div>
<div class="col-md-4">
<div style="padding: 20px; background:#f1f1f1; margin-bottom:30px;" class="pub"></div>
<div class="last_edito">
<div class="last_edito clearfix">
<div class="title">{l s='Les derniers éditos'}</div>
<ul>
{foreach from=$last_editos item=last_edito}