[Pkg-owncloud-commits] [owncloud] 57/199: fix warning text and margin

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 46555b50a123ebd367e28f0a4e67034bd3b086b6
Author: Volkan Gezer <volkangezer at gmail.com>
Date:   Tue May 27 02:11:58 2014 +0200

    fix warning text and margin
---
 core/lostpassword/css/lostpassword.css       | 7 +------
 core/lostpassword/templates/lostpassword.php | 6 +++---
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/core/lostpassword/css/lostpassword.css b/core/lostpassword/css/lostpassword.css
index 85cce9f..b7f7023 100644
--- a/core/lostpassword/css/lostpassword.css
+++ b/core/lostpassword/css/lostpassword.css
@@ -1,11 +1,6 @@
 #body-login
-input[type="text"],
-input[type="submit"] {
-	margin: 5px 0;
-}
-
 input[type="text"]#user{
-	padding-right: 12px;
+	padding-right: 20px;
 	padding-left: 41px;
 }
 
diff --git a/core/lostpassword/templates/lostpassword.php b/core/lostpassword/templates/lostpassword.php
index 83a23f7..d0fed38 100644
--- a/core/lostpassword/templates/lostpassword.php
+++ b/core/lostpassword/templates/lostpassword.php
@@ -21,10 +21,10 @@ OCP\Util::addStyle('lostpassword', 'lostpassword');
 				<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']): ?>
-				<br /><br />
-				<?php print_unescaped($l->t("Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?")); ?><br />
+				<br />
+				<p class="warning"><?php print_unescaped($l->t("Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?")); ?><br />
 				<input type="checkbox" name="continue" value="Yes" />
-					<?php print_unescaped($l->t('Yes, I really want to reset my password now')); ?><br/><br/>
+					<?php print_unescaped($l->t('Yes, I really want to reset my password now')); ?></p>
 				<?php endif; ?>
 			</p>
 			<input type="submit" id="submit" value="<?php print_unescaped($l->t('Reset')); ?>" />

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git