Skip to content

fixes issue 2981 #3022

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maxceem merged 2 commits into from
May 16, 2019
Merged

fixes issue 2981 #3022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ac782a
fixes issue 2981
sumitdaga May 11, 2019
3f94f43
fixed layout
sumitdaga May 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/components/Feed/Feed.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import _ from 'lodash'
import cn from 'classnames'
import moment from 'moment'
import PropTypes from 'prop-types'
import { Link } from 'react-router-dom'
import FeedComments from './FeedComments'
import CommentEditToggle from '../ActionCard/CommentEditToggle'
import RichTextArea from '../RichTextArea/RichTextArea'
Expand Down Expand Up @@ -106,6 +107,7 @@ class Feed extends React.Component {
const self = user && user.userId === currentUser.userId
const title = this.props.newTitle === null || this.props.newTitle === undefined ? this.props.title : this.props.newTitle
const content = topicMessage.newContent === null || topicMessage.newContent === undefined ? topicMessage.rawContent : topicMessage.newContent
const feedLink = window.location.pathname.substr(0, window.location.pathname.indexOf('#')) + `#feed-${id}`

topicHeader = (
<header styleName={'feed-header' + (tag === PROJECT_FEED_TYPE_MESSAGES ? ' is-private' : '' )} ref="header">
Expand Down Expand Up @@ -138,7 +140,7 @@ class Feed extends React.Component {
<div styleName="header-info">
<div styleName="title">{title}</div>
<div styleName="header-details">
<span>{moment(topicMessage.date).format('MMM D YYYY')}</span>
<Link to={feedLink}>{moment(topicMessage.date).format('MMM D YYYY')}</Link>
<span>{comments.length} post{comments.length !== 1 ? 's' : ''}</span>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Feed/Feed.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
margin-top: $base-unit;
white-space: nowrap;

> span + span::before {
> span::before {
content: " • ";
display: inline;
margin: 0 2px;
Expand Down