summaryrefslogtreecommitdiffstats
path: root/webapp/components/form_error.jsx
diff options
context:
space:
mode:
authorAsaad Mahmood <asaadmahmoodspin@users.noreply.github.com>2016-07-07 02:32:27 +0500
committerCorey Hulen <corey@hulen.com>2016-07-06 13:32:27 -0800
commit3eee51f74e893f3182519ad0edb72dd5d8b107fd (patch)
tree361e92ede053d091ea05ca06e363e125cfc3b9ae /webapp/components/form_error.jsx
parent31a0f65973cf34cb17f3a4a730455e5d8f8a1b72 (diff)
downloadchat-3eee51f74e893f3182519ad0edb72dd5d8b107fd.tar.gz
chat-3eee51f74e893f3182519ad0edb72dd5d8b107fd.tar.bz2
chat-3eee51f74e893f3182519ad0edb72dd5d8b107fd.zip
UI fix for errors in signup and login pages and adding space between buttons in the security tab (#3512)
* Fixing the errors style on login and signup pages * Adding space between login options in the security section
Diffstat (limited to 'webapp/components/form_error.jsx')
-rw-r--r--webapp/components/form_error.jsx11
1 files changed, 11 insertions, 0 deletions
diff --git a/webapp/components/form_error.jsx b/webapp/components/form_error.jsx
index 3c73759c5..047595ef2 100644
--- a/webapp/components/form_error.jsx
+++ b/webapp/components/form_error.jsx
@@ -8,6 +8,7 @@ export default class FormError extends React.Component {
// accepts either a single error or an array of errors
return {
error: React.PropTypes.node,
+ margin: React.PropTypes.node,
errors: React.PropTypes.arrayOf(React.PropTypes.node)
};
}
@@ -39,6 +40,16 @@ export default class FormError extends React.Component {
return null;
}
+ if (this.props.margin) {
+ return (
+ <div className='form-group has-error'>
+ <label className='control-label'>
+ {message}
+ </label>
+ </div>
+ );
+ }
+
return (
<div className='col-sm-12 has-error'>
<label className='control-label'>