From d9d7dfa39f74cb9a88c729d509fbca67fe3e57bc Mon Sep 17 00:00:00 2001 From: catarak Date: Fri, 2 Sep 2016 17:37:34 -0400 Subject: [PATCH] add cancel button to login and signup forms --- client/modules/User/pages/LoginView.js | 2 ++ client/modules/User/pages/SignupView.js | 2 ++ client/styles/components/_forms.scss | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/client/modules/User/pages/LoginView.js b/client/modules/User/pages/LoginView.js index e2a126ba..252d864e 100644 --- a/client/modules/User/pages/LoginView.js +++ b/client/modules/User/pages/LoginView.js @@ -3,6 +3,7 @@ import { reduxForm } from 'redux-form'; import { validateAndLoginUser } from '../actions'; import LoginForm from '../components/LoginForm'; import GithubButton from '../components/GithubButton'; +import { Link } from 'react-router'; function LoginView(props) { @@ -12,6 +13,7 @@ function LoginView(props) {

Or

+ Cancel ); } diff --git a/client/modules/User/pages/SignupView.js b/client/modules/User/pages/SignupView.js index fca4d8d3..3a8e6362 100644 --- a/client/modules/User/pages/SignupView.js +++ b/client/modules/User/pages/SignupView.js @@ -4,12 +4,14 @@ import * as UserActions from '../actions'; import { reduxForm } from 'redux-form'; import SignupForm from '../components/SignupForm'; import axios from 'axios'; +import { Link } from 'react-router'; function SignupView(props) { return (

Sign Up

+ Cancel
); } diff --git a/client/styles/components/_forms.scss b/client/styles/components/_forms.scss index fdd4b120..ed131ec1 100644 --- a/client/styles/components/_forms.scss +++ b/client/styles/components/_forms.scss @@ -4,4 +4,8 @@ color: $console-error-color; width: #{300 / $base-font-size}rem; font-size: #{12 / $base-font-size}rem; +} + +.form__cancel-button { + margin-top: #{10 / $base-font-size}rem; } \ No newline at end of file