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
2013-02-13 10:47:19 +01:00
parent d6f5566e65 787648f2c7
commit dfb4aedbde
3 changed files with 36 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/tools.js
+3 -2
View File
@@ -175,7 +175,7 @@ function addBookmark(url, title)
{
if (window.sidebar)
return window.sidebar.addPanel(title, url, "");
else if ( window.external )
else if ( window.external && ('AddFavorite' in window.external))
return window.external.AddFavorite( url, title);
else if (window.opera && window.print)
return true;
@@ -188,7 +188,8 @@ function writeBookmarkLink(url, title, text, img)
if (img)
insert = writeBookmarkLinkObject(url, title, '<img src="' + img + '" alt="' + escape(text) + '" title="' + escape(text) + '" />') + '&nbsp';
insert += writeBookmarkLinkObject(url, title, text);
document.write(insert);
if (window.sidebar || window.opera && window.print || (window.external && ('AddFavorite' in window.external)))
document.write(insert);
}
function writeBookmarkLinkObject(url, title, insert)
themes/default/css/authentication.css
+18 -13
View File
@@ -1,16 +1,15 @@
/* create account ****************************************************************************** */
#account-creation_form fieldset, fieldset.account_creation {
#account-creation_form fieldset, fieldset.account_creation {
padding:0 0 15px 0;
border:1px solid #ccc;
background:#f8f8f8
background:#f8f8f8;
}
#account-creation_form h3 {
#account-creation_form h3 {
margin:0 0 15px 0;
padding:8px;
font-size:14px;
color:#fff;
text-transform:uppercase;
background:url(../img/bg_form_h3.png) repeat-x 0 0 #989898
background:url(../img/bg_form_h3.png) repeat-x 0 0 #989898;
}
#center_column #account-creation_form p {margin:0; padding:0 0 10px 0}
#account-creation_form p.required {color:#222}
@@ -25,18 +24,22 @@
padding:6px 15px;
width:230px;/* 260 */
font-size:14px;
text-align:right
text-align:right;
}
#account-creation_form p.radio label {
float:none;
padding-right:10px;
width:auto;
font-size:14px
font-size:14px;
}
#account-creation_form p.radio input {
position: relative;
bottom: -3px;
}
#account-creation_form p.checkbox label {
float:none;
width:auto;
font-size:12px
font-size:12px;
}
#account-creation_form p.text input,
#account-creation_form p.password input,
@@ -46,7 +49,7 @@
width:360px;/* 370 */
border:1px solid #ccc;
font-size: 12px;
color:#666
color:#666;
}
#account-creation_form span.inline-infos{display:inline-block;}
#account-creation_form p.checkbox input {
@@ -56,19 +59,19 @@
margin-right:10px;
border:1px solid #ccc;
font-size: 12px;
color:#666
color:#666;
}
#account-creation_form p.textarea textarea {
height:80px;
width:370px;
border:1px solid #ccc;
font-size: 12px;
color:#666
color:#666;
}
#account-creation_form span.form_info {
display:block;
margin:5px 0 0 265px;
color:#666
color:#666;
}
#account-creation_form p.inline-infos {
margin:0 0 0 100px !important;
@@ -78,4 +81,6 @@
#account-creation_form .id_state, #account-creation_form .dni, #account-creation_form .postcode {
display: none;
}
#center_column #account-creation_form p.cart_navigation {margin:20px 0}
#center_column #account-creation_form p.cart_navigation {
margin:20px 0;
}
themes/default/css/identity.css
+15 -26
View File
@@ -1,23 +1,21 @@
#identity #left_column {display:none}
#identity #center_column{width:757px}
#identity h3 {
font-weight:normal;
font-size:13px
font-size:13px;
}
#identity p {
padding-bottom:10px;
}
#identity p {padding-bottom:10px}
#identity form.std fieldset {
margin-top:0;
padding:10px;
-moz-border-radius:3px;
-webkit-border-radius:3px;
border-radius:3px;
background:#eee
background:#eee;
}
#identity .std p.required {color:#333}
#identity .std p.text label,
#identity .std p.password label,
#identity .std p.select label {
@@ -26,57 +24,48 @@
width:174px;/* 184 */
font-weight:bold;
font-size:12px;
text-align:right
text-align:right;
}
#identity .std p.text label sup,
#identity .std p.password label sup,
#identity .std p.select label sup {color:#990000}
#identity .std p.select label sup {color:#990000;}
#identity .std p.text input,
#identity .std p.password input {
padding:0 5px;
height:20px;
width:253px;/* 263 */
border:1px solid #ccc;
background:url(../img/bg_input.png) repeat-x 0 0 #fff
background:url(../img/bg_input.png) repeat-x 0 0 #fff;
}
#identity .std p.select select {
border:1px solid #ccc
border:1px solid #ccc;
}
#identity .std p.radio span {
display:inline-block;
padding-right:10px;
width:174px;/* 184 */
font-weight:bold;
font-size:12px;
text-align:right
text-align:right;
}
#identity .std p.radio input {
padding:0 5px;
height:auto;
width:auto;
border:none;
background:none
background:none;
position: relative;
bottom: -3px;
}
#identity .std p.checkbox input {
position:relative;
top:2px;
left:0;
margin:0 2px 0 187px;
}
#identity .std p.submit {padding:10px 0 20px 187px}
#identity .std p.submit .button {padding:5px 25px}
#identity .std #security_informations {
padding:0 0 0 187px;
font-size:11px
}
font-size:11px;
}