diff options
-rw-r--r-- | apps/files_sharing/css/authenticate.css | 7 | ||||
-rw-r--r-- | apps/files_sharing/templates/authenticate.php | 4 | ||||
-rw-r--r-- | core/css/fixes.css | 4 | ||||
-rw-r--r-- | core/lostpassword/templates/lostpassword.php | 6 | ||||
-rw-r--r-- | core/lostpassword/templates/resetpassword.php | 6 |
5 files changed, 10 insertions, 17 deletions
diff --git a/apps/files_sharing/css/authenticate.css b/apps/files_sharing/css/authenticate.css index ef963ba7c65..a5aa55632bb 100644 --- a/apps/files_sharing/css/authenticate.css +++ b/apps/files_sharing/css/authenticate.css @@ -1,10 +1,3 @@ -#body-login form label.infield { - width: 190px; - padding: 10px; - left: 8px; - top: 8px; -} - #password { width: 190px !important; padding: 10px; diff --git a/apps/files_sharing/templates/authenticate.php b/apps/files_sharing/templates/authenticate.php index 055329ecabf..f899a54e0f9 100644 --- a/apps/files_sharing/templates/authenticate.php +++ b/apps/files_sharing/templates/authenticate.php @@ -6,10 +6,10 @@ <?php if (isset($_['wrongpw'])): ?> <div class="warning"><?php p($l->t('The password is wrong. Try again.')); ?></div> <?php endif; ?> - <p class="infield"> + <p> <label for="password" class="infield"><?php p($l->t('Password')); ?></label> <input type="password" name="password" id="password" - placeholder="" value="" + placeholder="<?php p($l->t('Password')); ?>" value="" autocomplete="off" autocapitalize="off" autocorrect="off" autofocus /> <input type="submit" value="" class="svg icon-confirm" /> diff --git a/core/css/fixes.css b/core/css/fixes.css index 0f18f0a56cd..fc122b1eff1 100644 --- a/core/css/fixes.css +++ b/core/css/fixes.css @@ -42,10 +42,6 @@ select { border-bottom: 1px solid lightgrey; background-color: white; /* don't change background on hover */ } -.lte9 #body-login form label.infield { - background-color: white; /* don't change background on hover */ - -ms-filter: "progid:DXImageTransform.Microsoft.Chroma(color='white')"; -} /* disable opacity of info text on gradient since we cannot set a good backround color to use the filter&background hack as with the input labels */ diff --git a/core/lostpassword/templates/lostpassword.php b/core/lostpassword/templates/lostpassword.php index d0fed38ee27..fdfa32344ec 100644 --- a/core/lostpassword/templates/lostpassword.php +++ b/core/lostpassword/templates/lostpassword.php @@ -16,8 +16,10 @@ OCP\Util::addStyle('lostpassword', 'lostpassword'); </p></div> <?php endif; ?> <div class="update"><?php print_unescaped($l->t('You will receive a link to reset your password via Email.')); ?></div> - <p class="infield"> - <input type="text" name="user" id="user" placeholder="" value="" autocomplete="off" required autofocus /> + <p> + <input type="text" name="user" id="user" + placeholder="<?php print_unescaped($l->t( 'Username' )); ?>" + value="" autocomplete="off" required autofocus /> <label for="user" class="infield"><?php print_unescaped($l->t( 'Username' )); ?></label> <img class="svg" src="<?php print_unescaped(image_path('', 'actions/user.svg')); ?>" alt=""/> <?php if ($_['isEncrypted']): ?> diff --git a/core/lostpassword/templates/resetpassword.php b/core/lostpassword/templates/resetpassword.php index 881455f5a9d..11dce9f112b 100644 --- a/core/lostpassword/templates/resetpassword.php +++ b/core/lostpassword/templates/resetpassword.php @@ -4,9 +4,11 @@ <h1><?php p($l->t('Your password was reset')); ?></h1> <p><a href="<?php print_unescaped(OC_Helper::linkTo('', 'index.php')) ?>/"><?php p($l->t('To login page')); ?></a></p> <?php else: ?> - <p class="infield"> + <p> <label for="password" class="infield"><?php p($l->t('New password')); ?></label> - <input type="password" name="password" id="password" value="" required /> + <input type="password" name="password" id="password" + placeholder="<?php p($l->t('New password')); ?>" + value="" required /> </p> <input type="submit" id="submit" value="<?php p($l->t('Reset password')); ?>" /> <?php endif; ?> |