From d2703421cc2cc3776b87acea39b62c3dc3fe1a1a Mon Sep 17 00:00:00 2001 From: MaiUbeid Date: Fri, 29 Nov 2019 15:40:39 +0200 Subject: [PATCH 1/2] edit error in style --- client/src/components/pages/SignIn/index.js | 5 +---- .../components/pages/SignIn/signIn.module.css | 2 +- .../components/pages/SignUp/signUp.module.css | 21 +++++++++++++------ 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/client/src/components/pages/SignIn/index.js b/client/src/components/pages/SignIn/index.js index 2947b1c..dabf12d 100644 --- a/client/src/components/pages/SignIn/index.js +++ b/client/src/components/pages/SignIn/index.js @@ -71,7 +71,6 @@ class SignInForm extends Component { ], })( } @@ -89,7 +88,6 @@ class SignInForm extends Component { ], })( } @@ -105,7 +103,6 @@ class SignInForm extends Component { htmlType="submit" onClick={this.handleSubmit} className="login-form-button" - size="large" block > Log in @@ -113,7 +110,7 @@ class SignInForm extends Component { Don't have an account?{' '} - Regregister now! + Register now! diff --git a/client/src/components/pages/SignIn/signIn.module.css b/client/src/components/pages/SignIn/signIn.module.css index a35f9a8..a861d7a 100644 --- a/client/src/components/pages/SignIn/signIn.module.css +++ b/client/src/components/pages/SignIn/signIn.module.css @@ -20,7 +20,7 @@ } .logo { - width: 35%; + width: 30%; height: auto; } diff --git a/client/src/components/pages/SignUp/signUp.module.css b/client/src/components/pages/SignUp/signUp.module.css index 5808507..1b76826 100644 --- a/client/src/components/pages/SignUp/signUp.module.css +++ b/client/src/components/pages/SignUp/signUp.module.css @@ -2,26 +2,31 @@ display: flex; justify-content: space-between; } + .logoSection { background: linear-gradient(rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5)), - url('https://imgur.com/Pi6j1NV.jpg'); + url('https://imgur.com/Pi6j1NV.jpg'); background-size: cover; background-position: center; width: 60%; height: 100vh; } + .formSection { width: 30%; - margin: 3rem auto; + margin: 2% auto; } -.logo__layout{ +.logo__layout { width: 100%; display: flex; justify-content: space-between; + margin-bottom: 9rem; } + .logo { width: 30%; + height: auto; } .heading { @@ -30,14 +35,17 @@ font-weight: bold; margin-top: 2rem; } + .signUpBtn { text-align: center; } + .hasAccount { text-align: center; color: var(--main-black); font-family: 'roboto'; } + .signin { display: inline; font-size: 1.2rem; @@ -51,8 +59,8 @@ } .formSection { - margin: 0; - width: 100%; + margin: 0 auto auto; + width: 100%; } .logoSection { @@ -62,6 +70,7 @@ .logo { margin: -30% auto auto; } + .heading { margin-bottom: 10rem; } @@ -70,4 +79,4 @@ font-size: 4rem; margin-left: 1rem; } -} \ No newline at end of file +} From 9c50b34e1ef2ed0f4f4f479b9d3f55a5200fa3f5 Mon Sep 17 00:00:00 2001 From: rana Date: Fri, 29 Nov 2019 17:21:57 +0200 Subject: [PATCH 2/2] fix style for signin and sign up page --- client/src/components/pages/SignIn/index.js | 6 ++-- .../components/pages/SignIn/signIn.module.css | 11 ++++-- client/src/components/pages/SignUp/index.js | 16 ++++----- .../components/pages/SignUp/signUp.module.css | 35 +++++++------------ 4 files changed, 32 insertions(+), 36 deletions(-) diff --git a/client/src/components/pages/SignIn/index.js b/client/src/components/pages/SignIn/index.js index dabf12d..ad0b4d7 100644 --- a/client/src/components/pages/SignIn/index.js +++ b/client/src/components/pages/SignIn/index.js @@ -108,9 +108,11 @@ class SignInForm extends Component { Log in - Don't have an account?{' '} + Don't have an account? + + Register now + - Register now! diff --git a/client/src/components/pages/SignIn/signIn.module.css b/client/src/components/pages/SignIn/signIn.module.css index a861d7a..c981e47 100644 --- a/client/src/components/pages/SignIn/signIn.module.css +++ b/client/src/components/pages/SignIn/signIn.module.css @@ -20,7 +20,7 @@ } .logo { - width: 30%; + width: 40%; height: auto; } @@ -39,9 +39,14 @@ font-size: 1rem; } +.signup { + margin-left: 0.5rem; + color: var(--main-color--light); +} + @media (max-width: 600px) { .signIn { - margin: 23% 10%; + margin: 5% 5%; } .formSection { @@ -54,7 +59,7 @@ } .logo__layout { - margin-bottom: 30rem; + margin-bottom: 10rem; } .heading { diff --git a/client/src/components/pages/SignUp/index.js b/client/src/components/pages/SignUp/index.js index 6dd0aa9..26e1292 100644 --- a/client/src/components/pages/SignUp/index.js +++ b/client/src/components/pages/SignUp/index.js @@ -76,7 +76,7 @@ class SignUp extends Component { form: { getFieldDecorator }, } = this.props; return ( -
+
@@ -154,14 +154,12 @@ class SignUp extends Component { -
- - Already a member? - -

Sign in

- -
-
+ + Already a member? + + Sign in + +
diff --git a/client/src/components/pages/SignUp/signUp.module.css b/client/src/components/pages/SignUp/signUp.module.css index 1b76826..61a86d2 100644 --- a/client/src/components/pages/SignUp/signUp.module.css +++ b/client/src/components/pages/SignUp/signUp.module.css @@ -1,6 +1,6 @@ .signUp { display: flex; - justify-content: space-between; + justify-content: space-around; } .logoSection { @@ -14,18 +14,18 @@ .formSection { width: 30%; - margin: 2% auto; + margin: 2% auto auto; } .logo__layout { width: 100%; display: flex; justify-content: space-between; - margin-bottom: 9rem; + margin-bottom: 4rem; } .logo { - width: 30%; + width: 40%; height: auto; } @@ -36,26 +36,18 @@ margin-top: 2rem; } -.signUpBtn { - text-align: center; -} - -.hasAccount { - text-align: center; - color: var(--main-black); - font-family: 'roboto'; +.signin__message { + font-size: 1rem; } .signin { - display: inline; - font-size: 1.2rem; margin-left: 0.5rem; color: var(--main-color--light); } @media (max-width: 600px) { .signUp { - margin: 23% 10%; + margin: 5% 5%; } .formSection { @@ -63,20 +55,19 @@ width: 100%; } - .logoSection { - display: none; + .logo__layout { + margin-bottom: 10rem; } - .logo { - margin: -30% auto auto; + .logoSection { + display: none; } .heading { margin-bottom: 10rem; } - .signin { - font-size: 4rem; - margin-left: 1rem; + .signin__message { + font-size: 3rem; } }