summaryrefslogtreecommitdiffstats
path: root/webapp/components/emoji
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/emoji
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/emoji')
-rw-r--r--webapp/components/emoji/components/add_emoji.jsx5
1 files changed, 4 insertions, 1 deletions
diff --git a/webapp/components/emoji/components/add_emoji.jsx b/webapp/components/emoji/components/add_emoji.jsx
index 46f345476..c3d61d32c 100644
--- a/webapp/components/emoji/components/add_emoji.jsx
+++ b/webapp/components/emoji/components/add_emoji.jsx
@@ -277,7 +277,10 @@ export default class AddEmoji extends React.Component {
</div>
{preview}
<div className='backstage-form__footer'>
- <FormError error={this.state.error}/>
+ <FormError
+ type='backstage'
+ error={this.state.error}
+ />
<Link
className='btn btn-sm'
to={'/' + this.props.team.name + '/emoji'}