dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

Browse Source
This commit is contained in:
Sarah Lorenzini
2012-12-05 11:03:16 +01:00
parent 2b10fcd712 5c63deb469
commit 7897d40e22
22 changed files with 103 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/blockcms/blockcms.tpl
+1 -1
View File
@@ -57,7 +57,7 @@
<li class="item"><a href="{$cmslink.link|addslashes}" title="{$cmslink.meta_title|escape:'htmlall':'UTF-8'}">{$cmslink.meta_title|escape:'htmlall':'UTF-8'}</a></li>
{/if}
{/foreach}
<li id="header_link_sitemap"><a href="{$link->getPageLink('sitemap')}" title="{l s='sitemap' mod='blockpermanentlinks'}">{l s='Sitemap' mod='blockpermanentlinks'}</a></li>
<li><a href="{$link->getPageLink('sitemap')}" title="{l s='sitemap' mod='blockcms'}">{l s='Sitemap' mod='blockcms'}</a></li>
{if $display_poweredby}<li class="last_item">{l s='Powered by' mod='blockcms'} <a target="_blank" href="http://www.prestashop.com">PrestaShop</a>&trade;</li>{/if}
</ul>
{$footer_text}
modules/homefeatured/homefeatured.css
+1 -3
View File
@@ -41,9 +41,7 @@
}
.ie9 #featured-products_block_center .product_image span.new{top:-18px;right:-38px}
.ie8 #featured-products_block_center .product_image span.new{top:-18px;right:-38px}
.ie8 #featured-products_block_center .product_image span.new {top:-17px;}
.ie7 #featured-products_block_center .product_image span.new {top:-30px;right:-25px}
.ie8 #featured-products_block_center .product_image span.new{top:-21px;right:-38px}
.lt-ie6 #featured-products_block_center .product_image span.new {top:-30px;right:-25px}
#featured-products_block_center .product_desc {height:45px;}