Merge pull request #1004 from pixelated/validate-email

[#923] Add material-ui framework

2 files changed, 3 insertions, 6 deletions

diff --git a/web-ui/src/login/page.js b/web-ui/src/login/page.js
index 621cf846..21acee3f 100644
--- a/web-ui/src/login/page.js
+++ b/web-ui/src/login/page.js
@@ -43,7 +43,7 @@ export const Page = ({ t, authError, error }) => (
       alt='Pixelated logo'
     />
     {rightPanel(t, error)}
-    <form className='standard' id='login_form' action='/login' method='post' noValidate >
+    <form className='standard' id='login_form' action='/login' method='post' noValidate>
       {errorMessage(t, authError)}
       <InputField name='username' label={t('login.email')} autoFocus />
       <InputField type='password' name='password' label={t('login.password')} />
diff --git a/web-ui/src/login/page.scss b/web-ui/src/login/page.scss
index 14e2d131..05c0abc2 100644
--- a/web-ui/src/login/page.scss
+++ b/web-ui/src/login/page.scss
@@ -37,10 +37,11 @@
 
   .input-field-group {
     width: 100%;
-    margin: 0 0 1.5em 0;
+    margin: 0;
   }
 
   .submit-button {
+    margin-top: 1.5em;
     width: 100%;
   }
 }
@@ -56,10 +57,6 @@
 }
 
 @media only screen and (min-width : 500px) {
-  #login_form {
-    margin-top: 1em;
-  }
-
   .login {
     width: 60%;
   }