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 committed 2012-11-28 18:52:17 +01:00
2 parents 72464dc9b7 d7ecc8bb99
commit 853515ebf0
5 files changed
+20 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

modules/homefeatured/homefeatured.css
+3 -1
View File
@@ -31,13 +31,15 @@
-moz-transform: rotate(45deg); -moz-transform: rotate(45deg);
-webkit-transform: rotate(45deg); -webkit-transform: rotate(45deg);
-o-transform:rotate(45deg); -o-transform:rotate(45deg);
-ms-transform: rotate(45deg); /*-ms-transform: rotate(45deg);*/
background-color: #990000; background-color: #990000;
transform: rotate(45deg); /* Newer browsers */ 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 */ 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 */ -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;} .ie8 #featured-products_block_center .product_image span.new {top:-17px;}
.ie7 #featured-products_block_center .product_image span.new {top:-30px;right:-25px} .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} .lt-ie6 #featured-products_block_center .product_image span.new {top:-30px;right:-25px}
themes/default/css/authentication.css
+1 -1
View File
@@ -1,7 +1,7 @@
/* create account ****************************************************************************** */ /* create account ****************************************************************************** */
#account-creation_form {} #account-creation_form {}
#account-creation_form fieldset { #account-creation_form fieldset, fieldset.account_creation {
padding:0 0 15px 0; padding:0 0 15px 0;
border:1px solid #ccc; border:1px solid #ccc;
background:#f8f8f8 background:#f8f8f8
themes/default/css/comparator.css
+1
View File
@@ -8,6 +8,7 @@ table#product_comparison {
padding:6px; padding:6px;
border-top:1px solid #ccc; border-top:1px solid #ccc;
border-left:1px solid #ccc; border-left:1px solid #ccc;
border-right:1px solid #ccc;
vertical-align:top vertical-align:top
} }
#product_comparison td.td_empty{ #product_comparison td.td_empty{
themes/default/css/global.css
+12 -1
View File
@@ -129,6 +129,17 @@ a, a:active, a:visited {
} }
a:hover {text-decoration:underline} a:hover {text-decoration:underline}
/* HACK IOS ipad, iphone */
input[type="text"], input[type="email"], input[type="search"], input[type="password"], input[type="submit"], input[type="image"] {
-webkit-appearance:none;
-moz-appearance:none;
appearance:none;
-webkit-border-radius:0px !important;
-moz-border-radius:0px !important;
border-radius:0px !important;
}
/*buttons ************************************************************************************** */ /*buttons ************************************************************************************** */
input.button_mini, input.button_small, input.button, input.button_large, input.button_mini, input.button_small, input.button, input.button_large,
input.button_mini_disabled, input.button_small_disabled, input.button_disabled, input.button_large_disabled, input.button_mini_disabled, input.button_small_disabled, input.button_disabled, input.button_large_disabled,
@@ -1748,7 +1759,7 @@ ul#suppliers_list li .right_side {float:right;}
/* ************************************************************************************************ /* ************************************************************************************************
addon customer privacy addon customer privacy
************************************************************************************************ */ ************************************************************************************************ */
#account-creation_form fieldset.customerprivacy label{ #account-creation_form fieldset.customerprivacy label, fieldset.customerprivacy label{
padding-bottom:0; padding-bottom:0;
font-size:14px; font-size:14px;
text-align:left; text-align:left;
themes/default/css/product_list.css
+3 -2
View File
@@ -57,14 +57,15 @@ ul#product_list {
-moz-transform: rotate(45deg); -moz-transform: rotate(45deg);
-webkit-transform: rotate(45deg); -webkit-transform: rotate(45deg);
-o-transform:rotate(45deg); -o-transform:rotate(45deg);
-ms-transform: rotate(45deg); /*-ms-transform: rotate(45deg);*/
background-color: #990000; background-color: #990000;
transform: rotate(45deg); /* Newer browsers */ 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 */ 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 */ -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} .ie7 #product_list li span.new {top:-30px;right:-25px}
.lt-ie6 #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}
#product_list li h3 { #product_list li h3 {