Fix: #194

t3framework · Nov 28, 2013 · de64d1d · de64d1d
1 parent c3106fa
commit de64d1d
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 47 deletions.
diff --git a/source/plg_system_t3/base-bs3/html/com_users/login/default_login.php b/source/plg_system_t3/base-bs3/html/com_users/login/default_login.php
@@ -13,6 +13,7 @@
 ?>
 
 <div class="login-wrap">
+
   <div class="login <?php echo $this->pageclass_sfx?>">
   	<?php if ($this->params->get('show_page_heading')) : ?>
   	<div class="page-header">
@@ -40,7 +41,7 @@
 
   	<form action="<?php echo JRoute::_('index.php?option=com_users&task=user.login'); ?>" method="post" class="form-horizontal">
 
-      <fieldset class="well">
+      <fieldset>
   			<?php foreach ($this->form->getFieldset('credentials') as $field): ?>
   				<?php if (!$field->hidden): ?>
   					<div class="form-group">
@@ -62,23 +63,25 @@
   			<?php echo JHtml::_('form.token'); ?>
   		</fieldset>
 
-  	</form>
-
-  </div>
-
-  <div class="other-links btn-group">
-		<a class="btn btn-link" href="<?php echo JRoute::_('index.php?option=com_users&view=reset'); ?>">
-			<?php echo JText::_('COM_USERS_LOGIN_RESET'); ?></a>
+      <div class="other-links form-group">
+        <div class="col-sm-offset-3 col-sm-9">
+        <ul>
+          <li><a href="<?php echo JRoute::_('index.php?option=com_users&view=reset'); ?>">
+            <?php echo JText::_('COM_USERS_LOGIN_RESET'); ?></a></li>
+          <li><a href="<?php echo JRoute::_('index.php?option=com_users&view=remind'); ?>">
+            <?php echo JText::_('COM_USERS_LOGIN_REMIND'); ?></a></li>
+          <?php
+          $usersConfig = JComponentHelper::getParams('com_users');
+          if ($usersConfig->get('allowUserRegistration')) : ?>
+          <li><a href="<?php echo JRoute::_('index.php?option=com_users&view=registration'); ?>">
+              <?php echo JText::_('COM_USERS_LOGIN_REGISTER'); ?></a></li>
+          <?php endif; ?>
+        </ul>
+        </div>
+      </div>
 
-		<a class="btn btn-link" href="<?php echo JRoute::_('index.php?option=com_users&view=remind'); ?>">
-			<?php echo JText::_('COM_USERS_LOGIN_REMIND'); ?></a>
+  	</form>
 
-		<?php
-		$usersConfig = JComponentHelper::getParams('com_users');
-		if ($usersConfig->get('allowUserRegistration')) : ?>
-		<a class="btn btn-link" href="<?php echo JRoute::_('index.php?option=com_users&view=registration'); ?>">
-				<?php echo JText::_('COM_USERS_LOGIN_REGISTER'); ?></a>
-		<?php endif; ?>
   </div>
 
 </div>
diff --git a/source/tpl_t3_bs3_blank/less/joomla.less b/source/tpl_t3_bs3_blank/less/joomla.less
@@ -375,44 +375,38 @@ article aside .btn-group {
 //
 // LOGIN
 // ---------------------------------------------------------
-.login h1 {
-}
+.login-wrap{
 
-.login_form fieldset,
-.login fieldset {
-  padding: 15px 0 0;
-}
+  // Header
+  .page-headder {
+  }
 
-.login_form fieldset p,
-.login fieldset p {
-  margin: 0 0 5px;
-}
+  // Description
+  .login-description {
 
-.login_form label,
-.login label {
-  display: block;
-  font-weight: bold;
-}
+  }
 
-.login-fields {
-  margin: 0 0 10px;
-}
+  // Login Form
+  form {
 
-.login_form .input,
-.login_form .inputbox,
-.login-fields .required {
-  margin-left: 10px;
-  width: 150px;
-}
+    fieldset {
+    }
 
-.login_form .remember .input,
-.login_form .remember .inputbox {
-  width: 20px;
-}
+    label {
+    }
+
+    .form-group {
+    }
+
+  }
+
+  // Links
+  .other-links {
+    ul {
+      padding-left: @grid-gutter-width / 2;
+    }
+  }
 
-.login_form .btn,
-.login_form .button,
-.login button {
 }
 
 
@@ -421,6 +415,7 @@ article aside .btn-group {
 // REGISTER
 // ---------------------------------------------------------
 .form-register {
+
   fieldset {
     padding: 0 0 10px;
   }
@@ -451,6 +446,7 @@ article aside .btn-group {
   .button {
     margin-left: 140px;
   }
+
 }
 
 .registration fieldset dt {