// Merge with revision 7841

This commit is contained in:
rMalie
2011-08-02 11:43:58 +00:00
parent 3c8c85b1cd
commit e2c8d89e41
130 changed files with 6620 additions and 18585 deletions
+34 -48
View File
@@ -1,61 +1,50 @@
.comparison_feature_value
{
.comparison_feature_value {
padding: 5px;
margin-top: 5px
}
.comparison_feature
{
.comparison_feature {
padding: 5px;
color: red;
font-weight: bold
}
.comparison_feature_odd
{
.comparison_feature_odd {
background-color: #F1F2F4;
padding: 3px;
padding: 3px
}
.comparison_feature_even
{
padding: 3px;
.comparison_feature_even {
padding: 3px
}
.comparison_infos
{
.comparison_infos {
border-left: 1px dotted #595A5E;
vertical-align: top;
vertical-align: top
}
.comparison_infos_first
{
.comparison_infos_first {
border-left: 1px dotted #595A5E;
border-right: 1px dotted #595A5E
}
#product_comparison
{
border-collapse: collapse;
#product_comparison {
border-collapse: collapse
}
tr.comparison_header td
{
tr.comparison_header td {
background-color: #595A5E;
color: #FFFFFF;
font-weight: bold;
padding: 3px
}
.product_desc a
{
text-decoration: none;
.product_desc a {
text-decoration: none
}
.comparison_comment
{
background-color: #FFFFFF;
.comparison_comment {
background-color: #FFFFFF
}
@@ -69,14 +58,12 @@ tr.comparison_header td
width: 430px
}
.comment .customer_name
{
font-weight: bold;
.comment .customer_name {
font-weight: bold
}
.cmp_remove
{
.cmp_remove {
margin: auto;
text-align: center;
display: block;
@@ -85,37 +72,36 @@ tr.comparison_header td
display: block;
line-height: 22px;
height: 22px;
background: url('../../../../img/admin/delete.gif') no-repeat;
background: url('../../../../img/admin/delete.gif') no-repeat
}
.comparison_availability_statut
{
height: 27px;
.comparison_availability_statut {
height: 27px
}
.comparison_old_price
{
height: 13px;
.comparison_old_price {
height: 13px
}
.comparison_product_infos
{
.comparison_product_infos {
width: 100%;
text-align: center;
text-align: center
}
.comparison_unit_price
{
#center_column .products_block .comparison_product_infos a.product_image {
margin: 0px auto
}
.comparison_unit_price {
color:gray;
font-size:0.75em;
font-size:0.75em
}
.product_discount
{
.product_discount {
height: 13px;
color:#DA0F00;
font-weight:bold;
text-transform:uppercase;
text-transform:uppercase
}
+2 -1
View File
@@ -1221,7 +1221,8 @@ span.view_scroll_spacer {
background: #d0d3d8 url('../img/block_category_item_bg.jpg') repeat-x;
border: solid 1px #d0d3d8;
padding: 0.6em;
margin-bottom: 1.5em
margin-bottom: 1.5em;
height: 84px;
}
#suppliers_list li a, #manufacturers_list li a {
text-decoration: none;
+1 -1
View File
@@ -95,7 +95,7 @@ $_LANG['authentication_6335a00a08fde0fbb8f6d6630cdadd92'] = 'Datos personales';
$_LANG['authentication_1e884e3078d9978e216a027ecd57fb34'] = 'Correo electrónico';
$_LANG['authentication_bf2957630c4209f61a388a08c2154915'] = '(5 caracteres min.)';
$_LANG['authentication_455175f3f5be6306247babb349c0515a'] = 'Su dirección';
$_LANG['authentication_6a1fdb6502fefe71937a62c4d03a810e'] = 'Dirección, apartado de correos, el nombre de compañia';
$_LANG['authentication_ae47812e00631626815f5f75ad1abbbd'] = 'Calle, código postal, nombre de empresa, c / o';
$_LANG['authentication_846a54955f32846032981f8fe48c35ff'] = 'Dirección (2)';
$_LANG['authentication_092daa39d2b825e4a7fe9b31c2080ecb'] = 'Apartamento, suite, unidad, edificio, piso, etc';
$_LANG['authentication_0f68b904e33d9ac04605aecc958bcf52'] = 'Información adicional';
+1 -1
View File
@@ -225,7 +225,7 @@
<sup>*</sup>
</p>
{elseif $field_name eq "address2"}
<p class="text is_customer_param">
<p class="text">
<label for="address2">{l s='Address (Line 2)'}</label>
<input type="text" class="text" name="address2" id="address2" value="" />
</p>
@@ -44,11 +44,9 @@
<h5><a href="{$product->getLink()}" title="{$product->name|truncate:32:'...'|escape:'htmlall':'UTF-8'}">{$product->name|truncate:27:'...'|escape:'htmlall':'UTF-8'}</a></h5>
<div class="product_desc"><a href="{$product->getLink()}" title="{l s='More'}">{$product->description_short|strip_tags|truncate:130:'...'}</a></div>
<div class="comparison_product_infos">
<center>
<a href="{$product->getLink()}" title="{$product->name|escape:html:'UTF-8'}" class="product_image" >
<img src="{$link->getImageLink($product->link_rewrite, $product->id_image, 'home')}" alt="{$product->name|escape:html:'UTF-8'}" width="{$homeSize.width}" height="{$homeSize.height}" />
</a>
</center>
{if isset($product->show_price) && $product->show_price && !isset($restricted_country_mode) && !$PS_CATALOG_MODE}
<p class="price_container"><span class="price">{convertPrice price=$product->getPrice($taxes_behavior)}</span></p>
<div class="product_discount">