summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-12-03 08:26:44 -0500
committerChristopher Speller <crspeller@gmail.com>2015-12-03 08:26:44 -0500
commitffd5d554659816ac0fd24f1470fe7ee6dfe7ba50 (patch)
tree5467062fcffdaf1825f7cece129e3e50387cd640 /web
parent467a7b95a7eb708d3bb6b6aea3a2bf48a1c6c20c (diff)
parent7ae8806b9f9e6fdcb6bb8a38611454ec62e1c2ba (diff)
downloadchat-ffd5d554659816ac0fd24f1470fe7ee6dfe7ba50.tar.gz
chat-ffd5d554659816ac0fd24f1470fe7ee6dfe7ba50.tar.bz2
chat-ffd5d554659816ac0fd24f1470fe7ee6dfe7ba50.zip
Merge pull request #1589 from mattermost/PLT-1301a
PLT-1301a adding jump to search
Diffstat (limited to 'web')
-rw-r--r--web/react/components/search_results_item.jsx10
-rw-r--r--web/sass-files/sass/partials/_search.scss5
2 files changed, 13 insertions, 2 deletions
diff --git a/web/react/components/search_results_item.jsx b/web/react/components/search_results_item.jsx
index da422fe1b..6e17cfe32 100644
--- a/web/react/components/search_results_item.jsx
+++ b/web/react/components/search_results_item.jsx
@@ -41,7 +41,6 @@ export default class SearchResultsItem extends React.Component {
return (
<div
className='search-item-container post'
- onClick={this.handleClick}
>
<div className='search-channel__name'>{channelName}</div>
<div className='post__content'>
@@ -60,6 +59,15 @@ export default class SearchResultsItem extends React.Component {
{utils.displayDate(this.props.post.create_at) + ' ' + utils.displayTime(this.props.post.create_at)}
</time>
</li>
+ <li>
+ <a
+ href='#'
+ className='search-item__jump'
+ onClick={this.handleClick}
+ >
+ {'[Jump]'}
+ </a>
+ </li>
</ul>
<div className='search-item-snippet'>
<span
diff --git a/web/sass-files/sass/partials/_search.scss b/web/sass-files/sass/partials/_search.scss
index b7f658114..0debb7e54 100644
--- a/web/sass-files/sass/partials/_search.scss
+++ b/web/sass-files/sass/partials/_search.scss
@@ -95,7 +95,6 @@
border-top: $border-gray;
padding: 10px 1em;
margin: 0;
- cursor: pointer;
&:first-child {
border: none;
@@ -107,6 +106,10 @@
}
}
+.search-item__jump {
+ margin-left: 10px;
+}
+
.search-item-time {
color: #a8adb7;
}