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

Merge branch 'release' into development

Browse Source
This commit is contained in:
Francois Gaillard
2013-03-14 16:39:47 +01:00
parent 84b5b1ee26 505d3be5c3
commit 7f3678a776
715 changed files with 10968 additions and 19548 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/default/css/authentication.css
+2 -7
View File
@@ -68,14 +68,9 @@
font-size: 12px;
color:#666;
}
#account-creation_form span.form_info {
#account-creation_form span.form_info, #account-creation_form p.inline-infos {
display:block;
margin:5px 0 0 265px;
color:#666;
}
#account-creation_form p.inline-infos {
margin:0 0 0 100px !important;
font-size:12px;
margin:5px 0 0 265px!important;
color:#666;
}
#account-creation_form .id_state, #account-creation_form .dni, #account-creation_form .postcode {
themes/default/css/global.css
+1 -1
View File
@@ -1403,7 +1403,7 @@ a.iframe {font-weight:bold}
#addresses #center_column{width:757px}
#address p.inline-infos {
margin:0 0 0 100px !important;
margin:0 0 0 265px !important;
font-size:12px;
color:#666;
}
themes/default/css/order-opc.css
+3 -3
View File
@@ -70,9 +70,9 @@
color:#666
}
#new_account_form span.form_info,
#new_account_form span.inline-infos {
#new_account_form span.inline-infos, #new_account_form p.inline-infos {
display:block;
margin:5px 0 0 265px;
margin:5px 0 0 265px!important;
color:#666
}
#new_account_form .id_state, #new_account_form .dni, #new_account_form .postcode {
@@ -87,4 +87,4 @@
float: right;
margin-right: 20px;
padding: 0;
}
}
themes/default/css/product.css
+4 -1
View File
@@ -508,7 +508,10 @@ ul#uploadable_files,ul#text_fields {
.customizationUploadLine {
padding-bottom:10px;
}
.customizationUploadBrowse img + a {
position: relative;
top: -51px;
}
.customizationUploadLine label {
display:inline-block;
width:150px;