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

[-] FO : Fix bug #PSCFV-10889 wrong color when oos product

Browse Source
This commit is contained in:
gRoussac committed 2013-10-31 10:18:28 +01:00
1 parent 9c57c71deb
commit 036fa7cba6
2 files changed
+130 -131
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

themes/default/css/product_list.css
+129 -130
View File
@@ -1,149 +1,148 @@
ul#product_list { ul#product_list {
list-style-type: none list-style-type: none
} }
#product_list li { #product_list li {
margin-bottom: 14px; margin-bottom: 14px;
padding: 12px 8px; padding: 12px 8px;
border: 1px solid #eee; border: 1px solid #eee;
-moz-border-radius: 3px; -moz-border-radius: 3px;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
border-radius: 3px border-radius: 3px
} }
#product_list li a { #product_list li a {
color: #374853; color: #374853;
text-decoration: none text-decoration: none
} }
#product_list li .left_block { #product_list li .left_block {
float:left; float:left;
padding-top:58px; padding-top:58px;
width:15px width:15px
} }
#product_list li .left_block .compare label {display:none;} #product_list li .left_block .compare label {display:none;}
#product_list li p.compare input {
vertical-align: text-bottom
}
#product_list li p.compare input {
vertical-align: text-bottom
}
#product_list li .center_block { #product_list li .center_block {
float: left; float: left;
padding:0 7px; padding:0 7px;
width: 342px;/* 356 */ width: 342px;/* 356 */
border-right:1px dotted #ccc border-right:1px dotted #ccc
} }
#product_list a.product_img_link { #product_list a.product_img_link {
overflow:hidden; overflow:hidden;
position:relative; position:relative;
float: left; float: left;
display:block; display:block;
margin-right: 14px; margin-right: 14px;
border: 1px solid #ccc border: 1px solid #ccc
} }
#product_list a.product_img_link img { #product_list a.product_img_link img {
display: block; display: block;
vertical-align: bottom vertical-align: bottom
} }
#product_list li span.new { #product_list li span.new {
display: block; display: block;
position: absolute; position: absolute;
top: 15px; top: 15px;
right:-30px; right:-30px;
padding: 1px 4px; padding: 1px 4px;
width: 101px; width: 101px;
font-size:10px; font-size:10px;
color: #fff; color: #fff;
text-align: center; text-align: center;
text-transform: uppercase; text-transform: uppercase;
-moz-transform: rotate(45deg); -moz-transform: rotate(45deg);
-webkit-transform: rotate(45deg); -webkit-transform: rotate(45deg);
-o-transform:rotate(45deg); -o-transform:rotate(45deg);
background-color: #990000; background-color: #990000;
transform: rotate(45deg); transform: rotate(45deg);
-ms-transform: rotate(45deg); /* Newer browsers */ -ms-transform: rotate(45deg); /* Newer browsers */
} }
.ie8 #product_list li span.new{top:111px;right:0;width:94%}
.ie7 #product_list li span.new {top:111px;right:0;width:94%}
#product_list li h3 {
padding:0 0 10px 0;
font-size:13px;
color:#000
}
#product_list li a {
color: #000;
text-decoration: none;
}
#product_list li p.product_desc { .ie8 #product_list li span.new{top:111px;right:0;width:94%}
overflow: hidden; .ie7 #product_list li span.new {top:111px;right:0;width:94%}
padding:0; #product_list li h3 {
line-height:16px; padding:0 0 10px 0;
} font-size:13px;
#product_list li p.product_desc, color:#000
#product_list li p.product_desc a { }
color:#666; #product_list li a {
} color: #000;
text-decoration: none;
}
#product_list li p.product_desc {
overflow: hidden;
padding:0;
line-height:16px;
}
#product_list li p.product_desc,
#product_list li p.product_desc a {
color:#666;
}
#product_list li .right_block { #product_list li .right_block {
position:relative; position:relative;
float: left; float: left;
width: 145px; width: 145px;
text-align: right text-align: right
} }
#product_list li .discount, ul#product_list li .on_sale, ul#product_list li .online_only { #product_list li .discount, ul#product_list li .on_sale, ul#product_list li .online_only {
display: block; display: block;
font-weight: bold; font-weight: bold;
color: #990000; color: #990000;
text-transform: uppercase text-transform: uppercase
} }
#product_list li .discount { #product_list li .discount {
position:absolute; position:absolute;
top:0; top:0;
right:0; right:0;
display: inline-block; display: inline-block;
font-weight: bold; font-weight: bold;
padding: 1px 5px; padding: 1px 5px;
font-size: 10px; font-size: 10px;
color: #fff; color: #fff;
text-transform: uppercase; text-transform: uppercase;
background: none repeat scroll 0 0 #9B0000 background: none repeat scroll 0 0 #9B0000
} }
#product_list li .online_only { #product_list li .online_only {
margin:0 0 10px 0 margin:0 0 10px 0
} }
#product_list li .content_price { #product_list li .content_price {
margin:26px 0 15px 0; margin:26px 0 15px 0;
} }
#product_list li .price { #product_list li .price {
display: block; display: block;
margin-bottom: 15px; margin-bottom: 15px;
font-weight:bold; font-weight:bold;
font-size: 18px; font-size: 18px;
color:#990000 color:#990000
} }
#product_list li span.availability { #product_list li span.availability {
color: #488C40 color: #488C40
} }
#product_list li .ajax_add_to_cart_button { #product_list li span.warning_inline {
padding-left: 20px color: red
} }
#product_list li .ajax_add_to_cart_button span { #product_list li .ajax_add_to_cart_button {
display: block; padding-left: 20px
position: absolute; }
top: -1px; #product_list li .ajax_add_to_cart_button span {
left: -12px; display: block;
height: 26px; position: absolute;
width: 26px; top: -1px;
background: url(../img/icon/pict_add_cart.png) no-repeat 0 0 transparent left: -12px;
} height: 26px;
#product_list li .lnk_view { width: 26px;
display: block; background: url(../img/icon/pict_add_cart.png) no-repeat 0 0 transparent
margin-top:15px; }
padding:0 10px; #product_list li .lnk_view {
border:none; display: block;
font-weight:bold; margin-top:15px;
color:#0088CC; padding:0 10px;
background:url(../img/arrow_right_1.png) no-repeat 100% 4px transparent border:none;
} font-weight:bold;
#product_list li .lnk_view:hover {text-decoration:underline} color:#0088CC;
background:url(../img/arrow_right_1.png) no-repeat 100% 4px transparent
}
#product_list li .lnk_view:hover {text-decoration:underline}
themes/default/product-list.tpl
+1 -1
View File
@@ -50,7 +50,7 @@
{if (!$PS_CATALOG_MODE AND ((isset($product.show_price) && $product.show_price) || (isset($product.available_for_order) && $product.available_for_order)))} {if (!$PS_CATALOG_MODE AND ((isset($product.show_price) && $product.show_price) || (isset($product.available_for_order) && $product.available_for_order)))}
<div class="content_price"> <div class="content_price">
{if isset($product.show_price) && $product.show_price && !isset($restricted_country_mode)}<span class="price" style="display: inline;">{if !$priceDisplay}{convertPrice price=$product.price}{else}{convertPrice price=$product.price_tax_exc}{/if}</span><br />{/if} {if isset($product.show_price) && $product.show_price && !isset($restricted_country_mode)}<span class="price" style="display: inline;">{if !$priceDisplay}{convertPrice price=$product.price}{else}{convertPrice price=$product.price_tax_exc}{/if}</span><br />{/if}
{if isset($product.available_for_order) && $product.available_for_order && !isset($restricted_country_mode)}<span class="availability">{if ($product.allow_oosp || $product.quantity > 0)}{l s='Available'}{elseif (isset($product.quantity_all_versions) && $product.quantity_all_versions > 0)}{l s='Product available with different options'}{else}{l s='Out of stock'}{/if}</span>{/if} {if isset($product.available_for_order) && $product.available_for_order && !isset($restricted_country_mode)}<span class="availability">{if ($product.allow_oosp || $product.quantity > 0)}{l s='Available'}{elseif (isset($product.quantity_all_versions) && $product.quantity_all_versions > 0)}{l s='Product available with different options'}{else}<span class="warning_inline">{l s='Out of stock'}</span>{/if}</span>{/if}
</div> </div>
{if isset($product.online_only) && $product.online_only}<span class="online_only">{l s='Online only'}</span>{/if} {if isset($product.online_only) && $product.online_only}<span class="online_only">{l s='Online only'}</span>{/if}
{/if} {/if}