diff options
| author | Raghu Nayyar <me@iraghu.com> | 2013-08-30 00:59:59 -0700 |
|---|---|---|
| committer | Raghu Nayyar <me@iraghu.com> | 2013-08-30 00:59:59 -0700 |
| commit | 23a3e4f2cbaa65384f296a670cb9a00ba5918db9 (patch) | |
| tree | e9550568a66b529a50167046a6f794df77c93083 /core | |
| parent | 30173ec329a8f5b835b531f0b71b685708414c88 (diff) | |
| parent | 90ae95c73a66458a921c7efe24dbd0f32d980b48 (diff) | |
| download | nextcloud-server-23a3e4f2cbaa65384f296a670cb9a00ba5918db9.tar.gz nextcloud-server-23a3e4f2cbaa65384f296a670cb9a00ba5918db9.zip | |
Merge pull request #4633 from owncloud/backport-4610-stable5
Backport 4610 to stable5
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/styles.css | 10 | ||||
| -rw-r--r-- | core/js/js.js | 3 | ||||
| -rw-r--r-- | core/templates/login.php | 4 |
3 files changed, 12 insertions, 5 deletions
diff --git a/core/css/styles.css b/core/css/styles.css index 716dd4b5991..a02a9df11d2 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -189,6 +189,16 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b input[name="password-clone"] { padding-left:1.8em; width:11.7em !important; } input[name="adminpass-clone"] { padding-left:1.8em; width:11.7em !important; } +/* General new input field look */ +#body-login input[type="text"], +#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 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 */ .grouptop input { margin-bottom:0; diff --git a/core/js/js.js b/core/js/js.js index d878ac5c18e..586d698f3a2 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -683,8 +683,7 @@ $(document).ready(function(){ }); // 'show password' checkbox - $('#password').showPassword(); - $('#adminpass').showPassword(); + $('#adminpass').showPassword(); $('#pass2').showPassword(); //use infield labels diff --git a/core/templates/login.php b/core/templates/login.php index c0aad47e920..882ce234cf4 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -30,12 +30,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> <input type="checkbox" name="remember_login" value="1" id="remember_login" checked /><label for="remember_login"><?php p($l->t('remember')); ?></label> |