From 4e5bcbc27f61185bbc32e7301af21bb8974683f1 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Wed, 1 Mar 2017 11:42:03 -0700
Subject: [PATCH] even more design updates

---
 .../coral-admin/src/components/AdminLogin.js  | 30 ++++++++++-------
 .../coral-admin/src/components/NotFound.css   | 32 ++++++++++++++++---
 2 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/client/coral-admin/src/components/AdminLogin.js b/client/coral-admin/src/components/AdminLogin.js
index 3d374bcda..7c7d4b00f 100644
--- a/client/coral-admin/src/components/AdminLogin.js
+++ b/client/coral-admin/src/components/AdminLogin.js
@@ -1,7 +1,7 @@
 import React, {PropTypes} from 'react';
 import Layout from 'coral-admin/src/components/ui/Layout';
 import styles from './NotFound.css';
-import {Button, TextField, Alert} from 'coral-ui';
+import {Button, TextField, Alert, Success} from 'coral-ui';
 import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from '../translations';
 const lang = new I18n(translations);
@@ -29,20 +29,22 @@ class AdminLogin extends React.Component {
       <form onSubmit={this.handleSignIn}>
         {errorMessage && <Alert>{lang.t(`errors.${errorMessage}`)}</Alert>}
         <TextField
-          label='email'
+          label='Email Address'
           value={this.state.email}
           onChange={e => this.setState({email: e.target.value})} />
         <TextField
-          label='password'
+          label='Password'
           value={this.state.password}
           onChange={e => this.setState({password: e.target.value})}
           type='password' />
+        <div style={{height: 10}}></div>
         <Button
           type='submit'
           cStyle='black'
-          onClick={this.handleSignIn} full>Sign In</Button>
-        <p>
-          Forgot your password? <a href="#" onClick={e => {
+          full
+          onClick={this.handleSignIn}>Sign In</Button>
+        <p className={styles.forgotPasswordCTA}>
+          Forgot your password? <a href="#" className={styles.forgotPasswordLink} onClick={e => {
             e.preventDefault();
             this.setState({requestPassword: true});
           }}>Request a new one.</a>
@@ -51,23 +53,29 @@ class AdminLogin extends React.Component {
     );
     const requestPasswordForm = (
       this.props.passwordRequestSuccess
-      ? <p className={styles.passwordRequestSuccess}>{this.props.passwordRequestSuccess}</p>
+      ? <p className={styles.passwordRequestSuccess} onClick={() => {
+        location.href = location.href;
+      }}>
+          {this.props.passwordRequestSuccess} <a className={styles.signInLink} href="#">Sign in</a>
+          <Success />
+        </p>
       : <form onSubmit={this.handleRequestPassword}>
         <TextField
-          label='email'
+          label='Email Address'
           value={this.state.email}
           onChange={e => this.setState({email: e.target.value})} />
         <Button
           type='submit'
           cStyle='black'
+          full
           onClick={this.handleRequestPassword}>Reset Password</Button>
       </form>
     );
     return (
       <Layout fixedDrawer restricted={true}>
-        <div className={styles.layout}>
-          <h1>Team Sign In</h1>
-          <p>Sign in to interact with your community.</p>
+        <div className={styles.loginLayout}>
+          <h1 className={styles.loginHeader}>Team sign in</h1>
+          <p className={styles.loginCTA}>Sign in to interact with your community.</p>
           { this.state.requestPassword ? requestPasswordForm : signInForm }
         </div>
       </Layout>
diff --git a/client/coral-admin/src/components/NotFound.css b/client/coral-admin/src/components/NotFound.css
index c45fbcc02..9977f858a 100644
--- a/client/coral-admin/src/components/NotFound.css
+++ b/client/coral-admin/src/components/NotFound.css
@@ -1,15 +1,37 @@
 .layout {
+  max-width: 800px;
+  margin: 0 auto;
+}
+
+.loginLayout {
   max-width: 400px;
   margin: 0 auto;
 }
 
+.loginHeader, .loginCTA, .forgotPasswordCTA, .passwordRequestSuccess {
+  text-align: center;
+  font-size: 16px;
+}
+
+.forgotPasswordLink, .signInLink {
+  color: blue;
+  font-weight: normal;
+  text-decoration: none;
+}
+
+.forgotPasswordLink:hover, .signInLink:hover {
+  text-decoration: underline;
+}
+
 .layout h1 {
   font-size: 40px;
 }
 
-.passwordRequestSuccess {
-  padding: 8px 14px;
-  background: lightgreen;
-  border: 1px solid darkgreen;
-  border-radius: 4px;
+.loginHeader {
+  font-size: 30px;
+}
+
+.passwordRequestSuccess {
+  cursor: pointer;
+  padding: 8px 14px;
 }