From 99d03c1f4b2d4e10561fc4d0bef14ccd12ad0f9d Mon Sep 17 00:00:00 2001 From: Tayane Fernandes Date: Tue, 7 Mar 2017 14:22:49 -0300 Subject: [#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. --- web-ui/src/login/page.js | 2 +- web-ui/src/login/page.scss | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'web-ui/src/login') 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)} -
+ {errorMessage(t, authError)} 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%; } -- cgit v1.2.3