improved styles

code-corps · May 16, 2017 · 68b7a0a · 68b7a0a
1 parent 1471621
commit 68b7a0a
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 8 deletions.
diff --git a/app/components/password/forgot-password.js b/app/components/password/forgot-password.js
@@ -3,7 +3,7 @@ const { Component, set, get, inject: { service } } = Ember;
 import { task } from 'ember-concurrency';
 
 export default Component.extend({
-  classNames: ['forgot-password-form'],
+  classNames: ['form--centered', 'forgot-password-form'],
 
   /**
    * @property flashMessages

diff --git a/app/components/password/reset-password.js b/app/components/password/reset-password.js
@@ -3,7 +3,7 @@ const { Component, set, get, inject: { service } } = Ember;
 import { task } from 'ember-concurrency';
 
 export default Component.extend({
-  classNames: ['reset-password-form'],
+  classNames: ['form--centered', 'reset-password-form'],
 
   /**
    * @property flashMessages

diff --git a/app/styles/layout/_forms.scss b/app/styles/layout/_forms.scss
@@ -146,7 +146,7 @@ form {
   margin: 5px;
 }
 
-.login-form, .signup-form {
+.login-form, .signup-form, .reset-password-form, .forgot-password-form {
   .input-group {
     margin: 0 0 1em 0;
   }

diff --git a/app/templates/components/login-form.hbs b/app/templates/components/login-form.hbs
@@ -9,9 +9,6 @@
   <div class="input-group">
     {{input name="password" id="password" placeholder="Password" type="password" value=password}}
   </div>
-  {{#link-to 'password.forgot' classNames="t-forgot-password"}}
-    Forgot password
-  {{/link-to}}
 
   <div class="input-group">
     <button id="login" class="default" type="submit" disabled={{isLoading}}>
@@ -23,6 +20,10 @@
     </button>
   </div>
 
+  {{#link-to 'password.forgot' classNames="t-forgot-password"}}
+    Forgot password
+  {{/link-to}}
+
   {{#if errors}}
     {{#each errors.errors as |error|}}
       <p class="error">{{error.detail}}</p>

diff --git a/app/templates/components/password/forgot-password.hbs b/app/templates/components/password/forgot-password.hbs
@@ -3,7 +3,11 @@
 
     <p data-test-id="forgot-password-header">Enter your email and we'll send you a link to reset your password</p>
 
-    {{input name="email" autocapitalize="off" type="text" value=email}}
+    <div class="input-group">
+      {{#auto-focus}}
+        {{input name="email" autocapitalize="off" type="text" value=email}}
+      {{/auto-focus}}
+    </div>
 
     <div class="input-group">
       <button id="reset-password" class="default" type="submit" disabled={{isLoading}} {{action "forgotPassword" email}}>

diff --git a/app/templates/components/password/reset-password.hbs b/app/templates/components/password/reset-password.hbs
@@ -2,7 +2,9 @@
   <form>
     <div class="input-group">
       <label data-test-id="password-label">Password</label>
-      {{input id="password" autofocus="true" class="has-progress" name="password" type="password" autocomplete="off" value=password}}
+      {{#auto-focus}}
+        {{input id="password" autofocus="true" class="has-progress" name="password" type="password" autocomplete="off" value=password}}
+      {{/auto-focus}}
     </div>
 
     <div class="input-group">