diff --git a/app/soapbox/features/hashtag_timeline/index.js b/app/soapbox/features/hashtag_timeline/index.js index ea9b30e84..a489c669e 100644 --- a/app/soapbox/features/hashtag_timeline/index.js +++ b/app/soapbox/features/hashtag_timeline/index.js @@ -8,7 +8,6 @@ import { expandHashtagTimeline, clearTimeline } from '../../actions/timelines'; import { FormattedMessage } from 'react-intl'; import { connectHashtagStream } from '../../actions/streaming'; import { isEqual } from 'lodash'; -import ColumnBackButton from '../../components/column_back_button'; const mapStateToProps = (state, props) => ({ hasUnread: state.getIn(['timelines', `hashtag:${props.params.id}`, 'unread']) > 0, @@ -26,8 +25,10 @@ class HashtagTimeline extends React.PureComponent { }; title = () => { - const title = [this.props.params.id]; + const title = [`#${this.props.params.id}`]; + // TODO: wtf is all this? + // It exists in Mastodon's codebase, but undocumented if (this.additionalFor('any')) { title.push(' ', ); } @@ -43,6 +44,8 @@ class HashtagTimeline extends React.PureComponent { return title; } + // TODO: wtf is this? + // It exists in Mastodon's codebase, but undocumented additionalFor = (mode) => { const { tags } = this.props.params; @@ -108,9 +111,8 @@ class HashtagTimeline extends React.PureComponent { const { id } = this.props.params; return ( - - - + + - + diff --git a/app/styles/chats.scss b/app/styles/chats.scss index b093d7386..f21411ea9 100644 --- a/app/styles/chats.scss +++ b/app/styles/chats.scss @@ -332,7 +332,7 @@ .ui--chatroom { padding-bottom: 0; - .columns-area__panels__main .columns-area { + .columns-area__panels__main .columns-area .column { height: calc(100vh - 100px); box-sizing: border-box; overflow: hidden; diff --git a/app/styles/components/detailed-status.scss b/app/styles/components/detailed-status.scss index 0debad833..e65e3fff2 100644 --- a/app/styles/components/detailed-status.scss +++ b/app/styles/components/detailed-status.scss @@ -160,6 +160,11 @@ .thread { &__status { position: relative; + + // Only display line if posts are below + &:last-child .detailed-status__action-bar { + border-bottom: 0; + } } &__connector {