From 7ac782a30d3daf047f615bdcb05784dcea0f4daf Mon Sep 17 00:00:00 2001 From: sumitdaga Date: Sat, 11 May 2019 09:31:32 +0530 Subject: [PATCH 1/2] fixes issue 2981 --- src/components/Feed/Feed.jsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/Feed/Feed.jsx b/src/components/Feed/Feed.jsx index 1a61f8ef1..0eeb25d1f 100644 --- a/src/components/Feed/Feed.jsx +++ b/src/components/Feed/Feed.jsx @@ -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' @@ -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 = (
@@ -138,7 +140,7 @@ class Feed extends React.Component {
{title}
- {moment(topicMessage.date).format('MMM D YYYY')} + {moment(topicMessage.date).format('MMM D YYYY')} {comments.length} post{comments.length !== 1 ? 's' : ''}
From 3f94f43d756aa093b218b0fcdc6890f32c0adcf5 Mon Sep 17 00:00:00 2001 From: sumitdaga Date: Wed, 15 May 2019 23:25:07 +0530 Subject: [PATCH 2/2] fixed layout --- src/components/Feed/Feed.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Feed/Feed.scss b/src/components/Feed/Feed.scss index ff241f535..b08f263d5 100644 --- a/src/components/Feed/Feed.scss +++ b/src/components/Feed/Feed.scss @@ -111,7 +111,7 @@ margin-top: $base-unit; white-space: nowrap; - > span + span::before { + > span::before { content: " • "; display: inline; margin: 0 2px;