diff options
| author | Corey Hulen <corey@hulen.com> | 2015-07-17 14:09:59 -0800 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2015-07-17 14:09:59 -0800 |
| commit | f1329787357544b1f4ecdf36586b93206d56832e (patch) | |
| tree | 81e791193d73d407ce2153d8393a74c56202380d | |
| parent | b306ec84378b36372b5465c09233094314789bf2 (diff) | |
| parent | 8ead147ebc2c56705c1896586782553dcb30e271 (diff) | |
| download | chat-f1329787357544b1f4ecdf36586b93206d56832e.tar.gz chat-f1329787357544b1f4ecdf36586b93206d56832e.tar.bz2 chat-f1329787357544b1f4ecdf36586b93206d56832e.zip | |
Merge pull request #192 from nickago/MM-1079
MM-1079 Changed hover effect for menu
| -rw-r--r-- | web/react/components/post_info.jsx | 4 | ||||
| -rw-r--r-- | web/react/components/post_right.jsx | 4 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_post.scss | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/web/react/components/post_info.jsx b/web/react/components/post_info.jsx index 48efa95ba..d6422fe3a 100644 --- a/web/react/components/post_info.jsx +++ b/web/react/components/post_info.jsx @@ -31,9 +31,7 @@ module.exports = React.createClass({ <div className="dropdown"> { isOwner || (this.props.allowReply === "true" && type != "Comment") ? <div> - <a href="#" className="dropdown-toggle theme" type="button" data-toggle="dropdown" aria-expanded="false"> - [...] - </a> + <a href="#" className="dropdown-toggle theme" type="button" data-toggle="dropdown" aria-expanded="false" /> <ul className="dropdown-menu" role="menu"> { isOwner ? <li role="presentation"><a href="#" role="menuitem" data-toggle="modal" data-target="#edit_post" data-title={type} data-message={post.message} data-postid={post.id} data-channelid={post.channel_id} data-comments={type === "Post" ? this.props.commentCount : 0}>Edit</a></li> : "" } diff --git a/web/react/components/post_right.jsx b/web/react/components/post_right.jsx index dca05051d..cc6751738 100644 --- a/web/react/components/post_right.jsx +++ b/web/react/components/post_right.jsx @@ -129,9 +129,7 @@ RootPost = React.createClass({ <div className="dropdown"> { isOwner ? <div> - <a href="#" className="dropdown-toggle theme" type="button" data-toggle="dropdown" aria-expanded="false"> - [...] - </a> + <a href="#" className="dropdown-toggle theme" type="button" data-toggle="dropdown" aria-expanded="false" /> <ul className="dropdown-menu" role="menu"> <li role="presentation"><a href="#" role="menuitem" data-toggle="modal" data-target="#edit_post" data-title={type} data-message={this.props.post.message} data-postid={this.props.post.id} data-channelid={this.props.post.channel_id}>Edit</a></li> <li role="presentation"><a href="#" role="menuitem" data-toggle="modal" data-target="#delete_post" data-title={type} data-postid={this.props.post.id} data-channelid={this.props.post.channel_id} data-comments={this.props.commentCount}>Delete</a></li> diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index 465c50296..9368786d1 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -208,6 +208,12 @@ body.ios { .dropdown, .comment-icon__container { @include opacity(1); } + .dropdown-toggle:after { + content: '...'; + } + .dropdown-toggle:hover:after { + content: '[...]'; + } } background: #f5f5f5; } |