aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/css/styles.css1
-rw-r--r--core/js/jquery-showpassword.js6
2 files changed, 6 insertions, 1 deletions
diff --git a/core/css/styles.css b/core/css/styles.css
index 1a521019d98..3e150152b56 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -413,6 +413,7 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
#personal-show + label {
margin-top: 1em;
margin-left: -3em;
+ display:inline !important;
}
#passwordbutton {
margin-left: .5em;
diff --git a/core/js/jquery-showpassword.js b/core/js/jquery-showpassword.js
index e1737643b48..a4373ec82bf 100644
--- a/core/js/jquery-showpassword.js
+++ b/core/js/jquery-showpassword.js
@@ -38,7 +38,11 @@
'tabindex' : $element.attr('tabindex'),
'autocomplete' : 'off'
});
-
+
+ if($element.attr('placeholder') !== undefined) {
+ $clone.attr('placeholder', $element.attr('placeholder'));
+ }
+
return $clone;
};