summaryrefslogtreecommitdiff
path: root/web-ui/src/login
diff options
context:
space:
mode:
authorTayane Fernandes <tayane.rmf@gmail.com>2017-03-07 14:22:49 -0300
committerTayane Fernandes <tayane.rmf@gmail.com>2017-03-07 17:06:55 -0300
commit99d03c1f4b2d4e10561fc4d0bef14ccd12ad0f9d (patch)
tree9b5135af5ed36f86b07c617fa5b23469ac519f6a /web-ui/src/login
parentc36b8ca0fee86f52096a5336fd009d58a7279f37 (diff)
[#923] Add material-ui framework
Added material-ui framework (http://www.material-ui.com/#/) to facilitate the creation of UI components. I also adapted some colors to be compatible with our style guide.
Diffstat (limited to 'web-ui/src/login')
-rw-r--r--web-ui/src/login/page.js2
-rw-r--r--web-ui/src/login/page.scss7
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%;
}