From ffbcfef614715ffaa1d53bdd6744e533ddaeb8c1 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Tue, 29 Oct 2013 13:42:39 +0100 Subject: [PATCH] fix lost password screen - reuse available CSS rules --- core/lostpassword/css/lostpassword.css | 24 ++++++++++++++------ core/lostpassword/templates/lostpassword.php | 6 ++--- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/core/lostpassword/css/lostpassword.css b/core/lostpassword/css/lostpassword.css index bcb2d85698..85cce9f940 100644 --- a/core/lostpassword/css/lostpassword.css +++ b/core/lostpassword/css/lostpassword.css @@ -1,11 +1,12 @@ #body-login input[type="text"], input[type="submit"] { - margin-left: 0; + margin: 5px 0; } -input[type="text"] { - padding-right: 19px; +input[type="text"]#user{ + padding-right: 12px; + padding-left: 41px; } #body-login @@ -17,10 +18,19 @@ input[type="submit"] { padding-bottom: 7px; } -fieldset { - margin-left: 2px; +#body-login input[type="submit"]#submit { + width: 280px; } -.white { - color: white; +#body-login .update { + text-align: left; +} + +#body-login .update, +#body-login .error { + margin: 10px 0 5px 0; +} + +#user { + width: 226px !important; } diff --git a/core/lostpassword/templates/lostpassword.php b/core/lostpassword/templates/lostpassword.php index bfc9f23008..83a23f7b23 100644 --- a/core/lostpassword/templates/lostpassword.php +++ b/core/lostpassword/templates/lostpassword.php @@ -2,7 +2,7 @@ //load the file we need OCP\Util::addStyle('lostpassword', 'lostpassword'); if ($_['requested']): ?> -

+

t('The link to reset your password has been sent to your email.
If you do not receive it within a reasonable amount of time, check your spam/junk folders.
If it is not there ask your local administrator .')); ?> @@ -11,11 +11,11 @@ OCP\Util::addStyle('lostpassword', 'lostpassword');

-

+

t('Request failed!
Did you make sure your email/username was right?')); ?>

-
t('You will receive a link to reset your password via Email.')); ?>
+
t('You will receive a link to reset your password via Email.')); ?>