summaryrefslogtreecommitdiffstats
path: root/webapp/components/form_error.jsx
diff options
context:
space:
mode:
authorAsaad Mahmood <asaadmahmoodspin@users.noreply.github.com>2016-07-15 00:56:38 +0500
committerCorey Hulen <corey@hulen.com>2016-07-14 11:56:38 -0800
commit70283c20f69576d52b4f35ed9c138749523c6ca7 (patch)
tree6841d14c6a38e830fe120524168fafbf82a1a0a6 /webapp/components/form_error.jsx
parentc67729d7b6757758e7f7c9ebf70e85257e32dcd9 (diff)
downloadchat-70283c20f69576d52b4f35ed9c138749523c6ca7.tar.gz
chat-70283c20f69576d52b4f35ed9c138749523c6ca7.tar.bz2
chat-70283c20f69576d52b4f35ed9c138749523c6ca7.zip
PLT-3508/PLT-3516/PLT-3558/PLT-3570/PLT-3497 Multiple UI Improvements (#3553)
* PLT-3627 - Fixing spacing in RHS * PLT-3516 - Fixing errors in backstage * PLT-3558 - Fixing system console menu on small screens * PLT-3570 - Fixing account settings sidebar truncating issue * PLT-3497 - Moving see other themes link * Removing formatted message import from premade theme chooser
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 047595ef2..df6fa3ab0 100644
--- a/webapp/components/form_error.jsx
+++ b/webapp/components/form_error.jsx
@@ -7,6 +7,7 @@ export default class FormError extends React.Component {
static get propTypes() {
// accepts either a single error or an array of errors
return {
+ type: React.PropTypes.node,
error: React.PropTypes.node,
margin: React.PropTypes.node,
errors: React.PropTypes.arrayOf(React.PropTypes.node)
@@ -40,6 +41,16 @@ export default class FormError extends React.Component {
return null;
}
+ if (this.props.type === 'backstage') {
+ return (
+ <div className='pull-left has-error'>
+ <label className='control-label'>
+ {message}
+ </label>
+ </div>
+ );
+ }
+
if (this.props.margin) {
return (
<div className='form-group has-error'>