Merge branch 'ticket-12487-HTTPS' into develop

This commit is contained in:
Marion Muszynski 2017-03-09 12:48:53 +01:00
commit 8084e3cf36
2 changed files with 2 additions and 2 deletions

View File

@ -9,6 +9,6 @@
</div>
</div>
<div class="facebook_block">
<iframe src="http://www.facebook.com/plugins/likebox.php?href=http%3A%2F%2Fwww.facebook.com%2Fpages%2FPrivate-Sport-Shop%2F169450433067114&amp;width=240&amp;height=380&amp;colorscheme=dark&amp;show_faces=true&amp;border_color&amp;stream=false&amp;header=false&amp;appId=261512293886555" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:240px; height:380px;" allowTransparency="true"></iframe>
<iframe src="//www.facebook.com/plugins/likebox.php?href=http%3A%2F%2Fwww.facebook.com%2Fpages%2FPrivate-Sport-Shop%2F169450433067114&amp;width=240&amp;height=380&amp;colorscheme=dark&amp;show_faces=true&amp;border_color&amp;stream=false&amp;header=false&amp;appId=261512293886555" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:240px; height:380px;" allowTransparency="true"></iframe>
</div>
<!-- /MODULE Block text -->

View File

@ -23,7 +23,7 @@
{if $page_name != 'order'}
<div class="facebook_block">
<iframe src="http://www.facebook.com/plugins/likebox.php?href=http%3A%2F%2Fwww.facebook.com%2Fbebeboutik&amp;width=200&amp;height=350&amp;colorscheme=light&amp;show_faces=true&amp;border_color&amp;stream=false&amp;header=false" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:200px; height:350px;" allowTransparency="true"></iframe>
<iframe src="//www.facebook.com/plugins/likebox.php?href=http%3A%2F%2Fwww.facebook.com%2Fbebeboutik&amp;width=200&amp;height=350&amp;colorscheme=light&amp;show_faces=true&amp;border_color&amp;stream=false&amp;header=false" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:200px; height:350px;" allowTransparency="true"></iframe>
</div>
{/if}
<!-- /MODULE Block text -->