2 files changed, 19 insertions, 18 deletions
diff --git a/views/default/account/forms/login.php b/views/default/account/forms/login.php
index 7afef1404..cd66e3cdb 100644
--- a/views/default/account/forms/login.php
+++ b/views/default/account/forms/login.php
@@ -10,21 +10,22 @@
 	 * @copyright Curverider Ltd 2008
 	 * @link http://elgg.org/
 	 */
-	 
-	global $CONFIG;
-	
-	$form_body = "<p><label>" . elgg_echo('username') . "<br />" . elgg_view('input/text', array('internalname' => 'username', 'class' => 'general-textarea')) . "</label>";
-	$form_body .= "<br />";
-	$form_body .= "<label>" . elgg_echo('password') . "<br />" . elgg_view('input/password', array('internalname' => 'password', 'class' => 'general-textarea')) . "</label><br />";
-	$form_body .= elgg_view('input/submit', array('value' => elgg_echo('login'))) . "</p>";
-	$form_body .= "<p>";
-	$form_body .= (!isset($CONFIG->disable_registration) || !($CONFIG->disable_registration)) ? "<a href=\"{$vars['url']}account/register.php\">" . elgg_echo('register') . "</a> : " : "";
-	$form_body .= "<a href=\"{$vars['url']}account/forgotten_password.php\">" . elgg_echo('user:password:lost') . "</a></p>";  
-	
+	 
+	global $CONFIG;
+	
+	$form_body = "<p><label>" . elgg_echo('username') . "<br />" . elgg_view('input/text', array('internalname' => 'username', 'class' => 'login-textarea')) . "</label>";
+	$form_body .= "<br />";
+	$form_body .= "<label>" . elgg_echo('password') . "<br />" . elgg_view('input/password', array('internalname' => 'password', 'class' => 'login-textarea')) . "</label><br />";
+	$form_body .= elgg_view('input/submit', array('value' => elgg_echo('login'))) . "</p>";
+	$form_body .= "<p>";
+	$form_body .= (!isset($CONFIG->disable_registration) || !($CONFIG->disable_registration)) ? "<a href=\"{$vars['url']}account/register.php\">" . elgg_echo('register') . "</a> | " : "";
+	$form_body .= "<a href=\"{$vars['url']}account/forgotten_password.php\">" . elgg_echo('user:password:lost') . "</a></p>";  
+	
 	//<input name=\"username\" type=\"text\" class="general-textarea" /></label>
 ?>
 	
-	<div id="login-box">
-	<h2><?php echo elgg_echo('login'); ?></h2>
-		<?php echo elgg_view('input/form', array('body' => $form_body, 'action' => "{$vars['url']}action/login")); ?>
+	<div id="login-box">
+	<h2><?php echo elgg_echo('login'); ?></h2>
+		<?php echo elgg_view('input/form', array('body' => $form_body, 'action' => "{$vars['url']}action/login")); ?>
 		
 	</div>
 \ No newline at end of file
diff --git a/views/default/css.php b/views/default/css.php
index 93a2b3096..6311241d1 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -855,15 +855,15 @@ input[type="submit"] {
 	LOGIN / REGISTER
 *************************************** */
 #login-box {
-	margin-top: 20px;
+	margin: 10px;
     text-align:left;
-    border:1px solid #ddd;
-    width:300px;
     padding:10px;
     background: #ffffff;
-    
-    float:left;
 }
+#login-box .login-textarea {
+	width:155px;
+}
+
 #login-box-openid {
 	margin-top: 20px;
     text-align:left;