diff --git a/app/assets/javascripts/components/components/column_collapsable.jsx b/app/assets/javascripts/components/components/column_collapsable.jsx
index 6767590552..729d006174 100644
--- a/app/assets/javascripts/components/components/column_collapsable.jsx
+++ b/app/assets/javascripts/components/components/column_collapsable.jsx
@@ -7,7 +7,8 @@ const iconStyle = {
position: 'absolute',
right: '0',
top: '-48px',
- cursor: 'pointer'
+ cursor: 'pointer',
+ zIndex: '3'
};
const ColumnCollapsable = React.createClass({
@@ -41,7 +42,7 @@ const ColumnCollapsable = React.createClass({
const { icon, fullHeight, children } = this.props;
const { collapsed } = this.state;
const collapsedClassName = collapsed ? 'collapsable-collapsed' : 'collapsable';
-
+
return (
diff --git a/app/assets/javascripts/components/features/community_timeline/index.jsx b/app/assets/javascripts/components/features/community_timeline/index.jsx
index 1b40da3d74..38b98f0836 100644
--- a/app/assets/javascripts/components/features/community_timeline/index.jsx
+++ b/app/assets/javascripts/components/features/community_timeline/index.jsx
@@ -16,6 +16,7 @@ const messages = defineMessages({
});
const mapStateToProps = state => ({
+ hasUnread: state.getIn(['timelines', 'public', 'unread']) > 0,
accessToken: state.getIn(['meta', 'access_token'])
});
@@ -24,7 +25,8 @@ const CommunityTimeline = React.createClass({
propTypes: {
dispatch: React.PropTypes.func.isRequired,
intl: React.PropTypes.object.isRequired,
- accessToken: React.PropTypes.string.isRequired
+ accessToken: React.PropTypes.string.isRequired,
+ hasUnread: React.PropTypes.bool
},
mixins: [PureRenderMixin],
@@ -58,10 +60,10 @@ const CommunityTimeline = React.createClass({
},
render () {
- const { intl } = this.props;
+ const { intl, hasUnread } = this.props;
return (
-
+
} />
diff --git a/app/assets/javascripts/components/features/hashtag_timeline/index.jsx b/app/assets/javascripts/components/features/hashtag_timeline/index.jsx
index 6cb9e54828..7fb4133363 100644
--- a/app/assets/javascripts/components/features/hashtag_timeline/index.jsx
+++ b/app/assets/javascripts/components/features/hashtag_timeline/index.jsx
@@ -12,6 +12,7 @@ import { FormattedMessage } from 'react-intl';
import createStream from '../../stream';
const mapStateToProps = state => ({
+ hasUnread: state.getIn(['timelines', 'tag', 'unread']) > 0,
accessToken: state.getIn(['meta', 'access_token'])
});
@@ -20,7 +21,8 @@ const HashtagTimeline = React.createClass({
propTypes: {
params: React.PropTypes.object.isRequired,
dispatch: React.PropTypes.func.isRequired,
- accessToken: React.PropTypes.string.isRequired
+ accessToken: React.PropTypes.string.isRequired,
+ hasUnread: React.PropTypes.bool
},
mixins: [PureRenderMixin],
@@ -72,10 +74,10 @@ const HashtagTimeline = React.createClass({
},
render () {
- const { id } = this.props.params;
+ const { id, hasUn