[#923] Fix submit button style of material-ui

with @FrailWords

5 files changed, 30 insertions, 7 deletions

diff --git a/web-ui/src/backup_account/page.js b/web-ui/src/backup_account/page.js
index 73a5718b..91fb6863 100644
--- a/web-ui/src/backup_account/page.js
+++ b/web-ui/src/backup_account/page.js
@@ -63,7 +63,7 @@ export class Page extends React.Component {
                 <p>{t('backup-account.paragraph2')}</p>
                 <InputField name='email' label={t('backup-account.input-label')} errorText={this.state.error} onChange={this.validateEmail} />
                 <SubmitButton buttonText={t('backup-account.button')} disabled={!this.state.validEmail} />
-                <div>
+                <div className='link-content'>
                   <a href='/' className='link'>
                     <i className='fa fa-angle-left' aria-hidden='true' />
                     <span>{t('back-to-inbox')}</span>
diff --git a/web-ui/src/backup_account/page.scss b/web-ui/src/backup_account/page.scss
index 9d94c156..a4203d9b 100644
--- a/web-ui/src/backup_account/page.scss
+++ b/web-ui/src/backup_account/page.scss
@@ -101,7 +101,7 @@ p {
     display: flex;
     flex-direction: column;
 
-    div {
+    .input-field-group, .submit-button, .link-content {
       width: 70%;
       align-self: center;
     }
@@ -120,7 +120,7 @@ p {
   form {
     margin-left: 2.5em;
 
-    div {
+    .input-field-group, .submit-button, .link-content {
       width: 300px;
       align-self: flex-start;
     }
diff --git a/web-ui/src/common/submit_button/submit_button.js b/web-ui/src/common/submit_button/submit_button.js
index 1e7da021..73f9b21c 100644
--- a/web-ui/src/common/submit_button/submit_button.js
+++ b/web-ui/src/common/submit_button/submit_button.js
@@ -20,19 +20,37 @@ import RaisedButton from 'material-ui/RaisedButton';
 
 import './submit_button.scss';
 
-const SubmitButton = ({ buttonText, disabled }) => (
+const labelStyle = {
+  textTransform: 'none',
+  fontSize: '1em',
+  lineHeight: '48px'
+};
+
+const buttonStyle = {
+  height: '48px'
+};
+
+const SubmitButton = ({ buttonText, disabled=false }) => (
   <div className='submit-button'>
-    <RaisedButton primary label={buttonText} disabled={disabled} fullWidth labelStyle={{ textTransform: 'none' }} />
+    <RaisedButton type='submit'
+      label={buttonText}
+      disabled={disabled}
+      labelStyle={labelStyle}
+      buttonStyle={buttonStyle}
+      overlayStyle={buttonStyle}
+      fullWidth
+      primary
+    />
   </div>
 );
 
 SubmitButton.propTypes = {
   buttonText: React.PropTypes.string.isRequired,
-  disabled: React.PropTypes.boolean
+  disabled: React.PropTypes.bool
 };
 
 SubmitButton.defaultProps = {
-  disabled: true
+  disabled: false
 };
 
 export default SubmitButton;
diff --git a/web-ui/src/common/submit_button/submit_button.scss b/web-ui/src/common/submit_button/submit_button.scss
index ac1307a8..851899f7 100644
--- a/web-ui/src/common/submit_button/submit_button.scss
+++ b/web-ui/src/common/submit_button/submit_button.scss
@@ -20,6 +20,7 @@
 .submit-button {
   width: 100%;
   margin-bottom: 1em;
+  font-size: 1em;
 }
 
 @media only screen and (min-width : 500px) {
diff --git a/web-ui/src/common/submit_button/submit_button.spec.js b/web-ui/src/common/submit_button/submit_button.spec.js
index d4308e6d..0ba8137c 100644
--- a/web-ui/src/common/submit_button/submit_button.spec.js
+++ b/web-ui/src/common/submit_button/submit_button.spec.js
@@ -13,4 +13,8 @@ describe('SubmitButton', () => {
   it('renders an input of type submit for add email', () => {
     expect(submitButton.find('RaisedButton').props().label).toEqual('Add Email');
   });
+
+  it('renders button in enabled state', () => {
+    expect(submitButton.find('RaisedButton').props().disabled).toEqual(false);
+  });
 });