diff options
| author | Morris Jobke <morris.jobke@gmail.com> | 2013-08-28 17:04:15 +0400 |
|---|---|---|
| committer | Morris Jobke <morris.jobke@gmail.com> | 2013-08-28 17:04:15 +0400 |
| commit | b9a95af12c20f18376df4c4f8355b9911ff5a7fd (patch) | |
| tree | a99fc3ba7184d2242bca9fb1816aba03df3c0a16 | |
| parent | 5a037071840b49efc7f0597c28784d8febe3f1f3 (diff) | |
| parent | 0c8ac241dfe6e1d07a03d14b5ad349bb0f78b0cd (diff) | |
Merge pull request #4610 from owncloud/password-toggle-login
Password toggle login
| -rw-r--r-- | core/css/styles.css | 6 | ||||
| -rw-r--r-- | core/js/js.js | 1 | ||||
| -rw-r--r-- | core/templates/login.php | 4 |
3 files changed, 4 insertions, 7 deletions
diff --git a/core/css/styles.css b/core/css/styles.css index dee0778afbb..ce0d5abfc78 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -255,9 +255,9 @@ input[name="adminpass-clone"] { padding-left:1.8em; width:11.7em !important; } #body-login input[type="password"], #body-login input[type="email"] { border: 1px solid #323233; - -moz-box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 3px rgba(0,0,0,.25) inset; - -webkit-box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 3px rgba(0,0,0,.25) inset; - box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 3px rgba(0,0,0,.25) inset; + -moz-box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.25) inset; + -webkit-box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.25) inset; + box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.25) inset; } /* Nicely grouping input field sets */ diff --git a/core/js/js.js b/core/js/js.js index d580b6113e6..a456da8cb8e 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -709,7 +709,6 @@ $(document).ready(function(){ }); label.hide(); }; - setShowPassword($('#password'), $('label[for=show]')); setShowPassword($('#adminpass'), $('label[for=show]')); setShowPassword($('#pass2'), $('label[for=personal-show]')); setShowPassword($('#dbpass'), $('label[for=dbpassword]')); diff --git a/core/templates/login.php b/core/templates/login.php index 9143510f757..ee761f0aa52 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -21,12 +21,10 @@ </p> <p class="infield groupbottom"> - <input type="password" name="password" id="password" value="" data-typetoggle="#show" placeholder="" + <input type="password" name="password" id="password" value="" placeholder="" required<?php p($_['user_autofocus'] ? '' : ' autofocus'); ?> /> <label for="password" class="infield"><?php p($l->t('Password')); ?></label> <img class="svg" id="password-icon" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt=""/> - <input type="checkbox" id="show" name="show" /> - <label for="show"></label> </p> <?php if (isset($_['invalidpassword']) && ($_['invalidpassword'])): ?> |