Merge remote-tracking branch 'origin/develop' into fb_lineageStatusFilter

Author: labkey-susanh

core/resources/views/login.html

@@ -5,10 +5,10 @@
         <label for="email">Email</label>
         <input id="email" name="email" type="text" class="input-block" autocomplete="off">
         <label for="password">Password</label>
+        <input id="password" name="password" type="password" class="input-block" autocomplete="off">
         <div class="forgot-password-link">
             <a href="login-resetPassword.view">Forgot password</a>
         </div>
-        <input id="password" name="password" type="password" class="input-block" autocomplete="off">
         <input aria-labelledby="remember-label" type="checkbox" name="remember" id="remember" checked >
         <span id="remember-label">Remember my email address</span>
         <div class="termsOfUseSection" hidden>

core/webapp/login.css

@@ -82,8 +82,9 @@ ul.sso-list > li {
 
 .forgot-password-link {
     text-align: right;
-    width: 284px;
-    display: inline-block;
+    width: 350px;
+    margin-top: -10px;
+    margin-bottom: 10px;
 }
 
 .signing-in-msg {