Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop

This commit is contained in:
root 2017-05-09 14:45:02 +02:00
commit 3ef95b4ce1
4 changed files with 17 additions and 18 deletions

View File

@ -951,9 +951,12 @@ div#editorial_block_center p a:first-child{
text-align: center;
margin-bottom: 20px;
}
.footer_img img{ width: 70%;}
.footer_social{
.footer_img img{ width: 70%; }
.footer_social {
max-width: 300px;
margin: auto;
margin-top: 20px;
margin-bottom: 50px;
}
div#page #header {
z-index: 100;
@ -1582,6 +1585,7 @@ body#product div.psales{
position:relative;
margin-bottom: 10px;
}
body#category div.psales { height: 30px; }
body#address div#order_step_parent .gradient,
body#order div#order_step_parent .gradient,
body#category .sale_title .gradient,
@ -1627,8 +1631,8 @@ body#category div#sale_end {
color: #666666;
/*font-family: Georgia;*/
font-size: 12px;
height: 51px;
line-height: 50px;
height: 28px;
line-height: 28px;
position: relative;
text-indent: 50px;
width: 74%;

View File

@ -33,28 +33,21 @@
<div class="footer_img">
<div class="footer_social">
<!-- <div class="facebook">
<div class="fb-like" data-href="http://www.bebeboutik.com/" data-layout="button_count" data-action="like" data-show-faces="false" data-share="false"></div>
<div class="facebook">
<div class="fb-page" data-href="https://www.facebook.com/bebeboutik/" data-small-header="true" data-adapt-container-width="true" data-hide-cover="true" data-show-facepile="false"><blockquote cite="https://www.facebook.com/bebeboutik/" class="fb-xfbml-parse-ignore"><a href="https://www.facebook.com/bebeboutik/">Bébéboutik</a></blockquote></div>
<div id="fb-root"></div>
<script>(function(d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id)) return;
js = d.createElement(s); js.id = id;
js.src = "//connect.facebook.net/fr_FR/sdk.js#xfbml=1&version=v2.0";
js.src = "//connect.facebook.net/fr_FR/sdk.js#xfbml=1&version=v2.9&appId=144794092661847";
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));</script>
</div> -->
<div id="fb-root"></div>
<script>(function(d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id)) return;
js = d.createElement(s); js.id = id;
js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1";
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));</script>
<div class="twitter">
</div>
<div class="twitter">
</div>
</div>
</div>
</div>

View File

@ -10,6 +10,7 @@
<li>
<a href="{$link->getPageLink('identity.php', true)}" title="{l s='My personal information' mod='blockuserinfo'}">{l s='Information' mod='blockuserinfo'}</a>
</li>
<li><a href="{$base_dir_ssl}modules/loyalty/loyalty-program.php" title="{l s='Loyalty program' mod='blockuserinfo'}">{l s='Loyalty program' mod='blockuserinfo'}</a></li>
<li>
<a href="{$link->getPageLink('discount.php', true)}" title="{l s='My vouchers' mod='blockuserinfo'}">{l s='Vouchers' mod='blockuserinfo'}</a>
</li>

View File

@ -103,10 +103,11 @@ function showForm() {
{/if}
{/if}
</div>
{*
<div class="share">
<p class="facebook"><a onclick="window.open(this.href); return false;" href="http://www.facebook.com/sharer.php?u={$page_url|rawurlencode}&t={$sale->title[$cookie->id_lang]|rawurlencode}%20{l s='on' mod='privatesales'}%20{$shop_name|rawurlencode}">{l s='Share on Facebook' mod='privatesales'}</a></p>
<p class="twitter"><a onclick="window.open(this.href); return false;" href="https://twitter.com/share?url={$page_url|rawurlencode}">{l s='Tweet this page' mod='privatesales'}</a></p>
</div>
</div>*}
</div>
<div class="right">
{if $sale->video[$cookie->id_lang] != ''}