diff options
author | asaadmahmoodspin <asaad@battlehouse.com> | 2015-08-13 20:31:19 +0500 |
---|---|---|
committer | asaadmahmoodspin <asaad@battlehouse.com> | 2015-08-13 20:31:19 +0500 |
commit | 1a6d67b0cd82058cbf3a9d76c576958875833db7 (patch) | |
tree | 6905182695f62581523bb35764661b5bf007b28b /web/react/components/post_list.jsx | |
parent | 6d9e715e265a3265841bc351e6b22a4503c20c92 (diff) | |
parent | 14c121dc0cccdd36f97b0b13cde6dd3a5802bb9e (diff) | |
download | chat-1a6d67b0cd82058cbf3a9d76c576958875833db7.tar.gz chat-1a6d67b0cd82058cbf3a9d76c576958875833db7.tar.bz2 chat-1a6d67b0cd82058cbf3a9d76c576958875833db7.zip |
Merge pull request #5 from rgarmsen2295/mm-316
MM-316 Allows users to drag and drop files from their computer to the center pane or RHS to upload them
Diffstat (limited to 'web/react/components/post_list.jsx')
-rw-r--r-- | web/react/components/post_list.jsx | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx index 83f806b79..756ed521d 100644 --- a/web/react/components/post_list.jsx +++ b/web/react/components/post_list.jsx @@ -463,11 +463,17 @@ module.exports = React.createClass({ } return ( - <div ref="postlist" className="post-list-holder-by-time"> - <div className="post-list__table"> - <div className="post-list__content"> - { more_messages } - { postCtls } + <div> + <div className='center-file-overlay invisible'> + <span className='center-file-help-text'>Drop a file to upload it.</span> + <img className='center-file-help-picture' /> + </div> + <div ref="postlist" className="post-list-holder-by-time"> + <div className="post-list__table"> + <div className="post-list__content"> + { more_messages } + { postCtls } + </div> </div> </div> </div> |