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:
vAugagneur
2012-11-28 18:52:17 +01:00
parent 72464dc9b7 d7ecc8bb99
commit 853515ebf0
5 changed files with 2155 additions and 2140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/homefeatured/homefeatured.css
+71 -69
View File
@@ -1,69 +1,71 @@
#featured-products_block_center li {
margin-right:10px;
padding:10px 0;
width:126px;
height:240px
}
#featured-products_block_center li.last_item_of_line {margin-right:0;}
#featured-products_block_center h5 {
padding-top:5px;
height:30px;
font-size:12px;
color:#222
}
#featured-products_block_center .product_image {
display:block;
position:relative;
overflow:hidden
}
#featured-products_block_center .product_image span.new {
display: block;
position: absolute;
top: 15px;
right:-30px;
padding: 1px 4px;
width: 101px;
font-size:10px;
color: #fff;
text-align: center;
text-transform: uppercase;
-moz-transform: rotate(45deg);
-webkit-transform: rotate(45deg);
-o-transform:rotate(45deg);
-ms-transform: rotate(45deg);
background-color: #990000;
transform: rotate(45deg); /* Newer browsers */
filter: progid:DXImageTransform.Microsoft.Matrix(sizingMethod='auto expand', M11=0.7071067811865476, M12=-0.7071067811865475, M21=0.7071067811865475, M22=0.7071067811865476); /* IE6,IE7 */
-ms-filter: "progid:DXImageTransform.Microsoft.Matrix(SizingMethod='auto expand', M11=0.7071067811865476, M12=-0.7071067811865475, M21=0.7071067811865475, M22=0.7071067811865476)"; /* IE8 */
}
.ie8 #featured-products_block_center .product_image span.new {top:-17px;}
.ie7 #featured-products_block_center .product_image span.new {top:-30px;right:-25px}
.lt-ie6 #featured-products_block_center .product_image span.new {top:-30px;right:-25px}
#featured-products_block_center .product_desc {height:45px;}
#featured-products_block_center .product_desc,
#featured-products_block_center .product_desc a {
color:#666
}
#featured-products_block_center .lnk_more {
display:inline;
padding-right:10px;
font-weight:bold;
font-size:10px;
color:#0088cc;
background:url(img/arrow_right_1.png) no-repeat 100% 3px;
}
#featured-products_block_center .price_container {
margin-top:10px;
padding:0;
}
#featured-products_block_center .price {
font-weight:bold;
font-size:14px;
color:#990000
}
#featured-products_block_center li .ajax_add_to_cart_button {display:none;}
#featured-products_block_center li span.exclusive {display:none;}
#featured-products_block_center li {
margin-right:10px;
padding:10px 0;
width:126px;
height:240px
}
#featured-products_block_center li.last_item_of_line {margin-right:0;}
#featured-products_block_center h5 {
padding-top:5px;
height:30px;
font-size:12px;
color:#222
}
#featured-products_block_center .product_image {
display:block;
position:relative;
overflow:hidden
}
#featured-products_block_center .product_image span.new {
display: block;
position: absolute;
top: 15px;
right:-30px;
padding: 1px 4px;
width: 101px;
font-size:10px;
color: #fff;
text-align: center;
text-transform: uppercase;
-moz-transform: rotate(45deg);
-webkit-transform: rotate(45deg);
-o-transform:rotate(45deg);
/*-ms-transform: rotate(45deg);*/
background-color: #990000;
transform: rotate(45deg); /* Newer browsers */
filter: progid:DXImageTransform.Microsoft.Matrix(sizingMethod='auto expand', M11=0.7071067811865476, M12=-0.7071067811865475, M21=0.7071067811865475, M22=0.7071067811865476); /* IE6,IE7 */
-ms-filter: "progid:DXImageTransform.Microsoft.Matrix(SizingMethod='auto expand', M11=0.7071067811865476, M12=-0.7071067811865475, M21=0.7071067811865475, M22=0.7071067811865476)"; /* IE8 */
}
.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}
.lt-ie6 #featured-products_block_center .product_image span.new {top:-30px;right:-25px}
#featured-products_block_center .product_desc {height:45px;}
#featured-products_block_center .product_desc,
#featured-products_block_center .product_desc a {
color:#666
}
#featured-products_block_center .lnk_more {
display:inline;
padding-right:10px;
font-weight:bold;
font-size:10px;
color:#0088cc;
background:url(img/arrow_right_1.png) no-repeat 100% 3px;
}
#featured-products_block_center .price_container {
margin-top:10px;
padding:0;
}
#featured-products_block_center .price {
font-weight:bold;
font-size:14px;
color:#990000
}
#featured-products_block_center li .ajax_add_to_cart_button {display:none;}
#featured-products_block_center li span.exclusive {display:none;}
themes/default/css/authentication.css
+1 -1
View File
@@ -1,7 +1,7 @@
/* create account ****************************************************************************** */
#account-creation_form {}
#account-creation_form fieldset {
#account-creation_form fieldset, fieldset.account_creation {
padding:0 0 15px 0;
border:1px solid #ccc;
background:#f8f8f8
themes/default/css/comparator.css
+1
View File
@@ -8,6 +8,7 @@ table#product_comparison {
padding:6px;
border-top:1px solid #ccc;
border-left:1px solid #ccc;
border-right:1px solid #ccc;
vertical-align:top
}
#product_comparison td.td_empty{
themes/default/css/global.css
+2079 -2068
View File
File diff suppressed because it is too large Load Diff
themes/default/css/product_list.css
+3 -2
View File
@@ -57,14 +57,15 @@ ul#product_list {
-moz-transform: rotate(45deg);
-webkit-transform: rotate(45deg);
-o-transform:rotate(45deg);
-ms-transform: rotate(45deg);
/*-ms-transform: rotate(45deg);*/
background-color: #990000;
transform: rotate(45deg); /* Newer browsers */
filter: progid:DXImageTransform.Microsoft.Matrix(sizingMethod='auto expand', M11=0.7071067811865476, M12=-0.7071067811865475, M21=0.7071067811865475, M22=0.7071067811865476); /* IE6,IE7 */
-ms-filter: "progid:DXImageTransform.Microsoft.Matrix(SizingMethod='auto expand', M11=0.7071067811865476, M12=-0.7071067811865475, M21=0.7071067811865475, M22=0.7071067811865476)"; /* IE8 */
}
.ie8 #product_list li span.new{top:-17px;}
.ie9 #product_list li span.new{top:-18px;right:-38px}
.ie8 #product_list li span.new{top:-18px;right:-38px}
.ie7 #product_list li span.new {top:-30px;right:-25px}
.lt-ie6 #featured-products_block_center .product_image span.new {top:-30px;right:-25px}
#product_list li h3 {