diff options
| author | Corey Hulen <corey@hulen.com> | 2015-07-06 13:58:38 -0800 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2015-07-06 13:58:38 -0800 |
| commit | b418f4cd62eef5388f92bd52e0cb4b006bf4ea54 (patch) | |
| tree | 40b883241e8a7862fb46e3ff92be4f4d1430c6d4 /web/react | |
| parent | 8f48d639593b2862dc6c252c94b5fc2dadf8da03 (diff) | |
| parent | f51cc73aaf0da4973e13821a5201cd0e05e1e552 (diff) | |
| download | chat-b418f4cd62eef5388f92bd52e0cb4b006bf4ea54.tar.gz chat-b418f4cd62eef5388f92bd52e0cb4b006bf4ea54.tar.bz2 chat-b418f4cd62eef5388f92bd52e0cb4b006bf4ea54.zip | |
Merge pull request #135 from asaadmahmoodspin/master
MM-1461 - Updating Mattermost UI
Diffstat (limited to 'web/react')
| -rw-r--r-- | web/react/components/post_list.jsx | 2 | ||||
| -rw-r--r-- | web/react/components/view_image.jsx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx index 169efc766..fc5157ce6 100644 --- a/web/react/components/post_list.jsx +++ b/web/react/components/post_list.jsx @@ -123,7 +123,7 @@ module.exports = React.createClass({ $('.post-list__content div .post').removeClass('post--last'); $('.post-list__content div:last-child .post').addClass('post--last'); - $('body').on('mouseenter mouseleave', '.post', function(ev){ + $('body').on('mouseenter mouseleave', '.post:not(.post--comment.same--root)', function(ev){ if(ev.type === 'mouseenter'){ $(this).parent('div').prev('.date-separator, .new-separator').addClass('hovered--after'); $(this).parent('div').next('.date-separator, .new-separator').addClass('hovered--before'); diff --git a/web/react/components/view_image.jsx b/web/react/components/view_image.jsx index c573e9dbb..38f439946 100644 --- a/web/react/components/view_image.jsx +++ b/web/react/components/view_image.jsx @@ -161,7 +161,7 @@ module.exports = React.createClass({ <div className="image-links"> { config.AllowPublicLink ? <div> - <a href="#" className="text" data-title="Public Image" onClick={this.getPublicLink}>Get Public Link</a> + <a href="#" className="public-link text" data-title="Public Image" onClick={this.getPublicLink}>Get Public Link</a> <span className="text"> | </span> </div> : "" } |