summaryrefslogtreecommitdiffstats
path: root/web/react
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2015-07-10 13:56:36 -0400
committerJoram Wilander <jwawilander@gmail.com>2015-07-10 13:56:36 -0400
commit947da5d2878007a693460c7d3df29f19969683e5 (patch)
tree60774a88ba055afc82757c5023c9f41ccb0e7e00 /web/react
parentf433da2e5fcfb199e735c5231279f1d09820ba1d (diff)
parenteab6e1360afff9a03cee1721669fe161fb34b4a9 (diff)
downloadchat-947da5d2878007a693460c7d3df29f19969683e5.tar.gz
chat-947da5d2878007a693460c7d3df29f19969683e5.tar.bz2
chat-947da5d2878007a693460c7d3df29f19969683e5.zip
Merge pull request #162 from asaadmahmoodspin/master
UI Improvements for RHS
Diffstat (limited to 'web/react')
-rw-r--r--web/react/components/mention_list.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx
index 25834b9e5..ba2c53612 100644
--- a/web/react/components/mention_list.jsx
+++ b/web/react/components/mention_list.jsx
@@ -137,7 +137,7 @@ module.exports = React.createClass({
return (
<div className="mentions--top" style={{height: height, width: width, bottom: bottom, left: left}}>
- <div ref="mentionlist" className="mentions-box" style={{maxHeight: max_height, height: height, width: width}}>
+ <div ref="mentionlist" className="mentions-box" style={{height: height, width: width}}>
{ mentions }
</div>
</div>