diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2016-09-25 14:20:29 +0200 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-09-25 14:20:29 +0200 |
commit | 15f51dbf8c19d1072d873c3b92b5a638035728a1 (patch) | |
tree | fcba052482b155ffe3985cfe941e27b221d04f2d /app/assets/javascripts/components/features/status/index.jsx | |
parent | fc7b982b67996bb34e801866eaace5109677c08e (diff) |
Better styling for selected status in detailed view
Diffstat (limited to 'app/assets/javascripts/components/features/status/index.jsx')
-rw-r--r-- | app/assets/javascripts/components/features/status/index.jsx | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/app/assets/javascripts/components/features/status/index.jsx b/app/assets/javascripts/components/features/status/index.jsx index 7a810d474..167864a1c 100644 --- a/app/assets/javascripts/components/features/status/index.jsx +++ b/app/assets/javascripts/components/features/status/index.jsx @@ -1,12 +1,14 @@ -import { connect } from 'react-redux'; -import PureRenderMixin from 'react-addons-pure-render-mixin'; -import ImmutablePropTypes from 'react-immutable-proptypes'; -import { fetchStatus } from '../../actions/statuses'; -import Immutable from 'immutable'; -import EmbeddedStatus from '../../components/status'; -import { favourite, reblog } from '../../actions/interactions'; -import { replyCompose } from '../../actions/compose'; -import { selectStatus } from '../../reducers/timelines'; +import { connect } from 'react-redux'; +import PureRenderMixin from 'react-addons-pure-render-mixin'; +import ImmutablePropTypes from 'react-immutable-proptypes'; +import { fetchStatus } from '../../actions/statuses'; +import Immutable from 'immutable'; +import EmbeddedStatus from '../../components/status'; +import DetailedStatus from './components/detailed_status'; +import ActionBar from './components/action_bar'; +import { favourite, reblog } from '../../actions/interactions'; +import { replyCompose } from '../../actions/compose'; +import { selectStatus } from '../../reducers/timelines'; function selectStatuses(state, ids) { return ids.map(id => selectStatus(state, id)).filterNot(status => status === null); @@ -69,7 +71,8 @@ const Status = React.createClass({ <div style={{ overflowY: 'scroll', flex: '1 1 auto' }} className='scrollable'> <div>{this.renderChildren(ancestors)}</div> - <EmbeddedStatus status={status} onReply={this.handleReplyClick} onFavourite={this.handleFavouriteClick} onReblog={this.handleReblogClick} /> + <DetailedStatus status={status} /> + <ActionBar status={status} onReply={this.handleReplyClick} onFavourite={this.handleFavouriteClick} onReblog={this.handleReblogClick} /> <div>{this.renderChildren(descendants)}</div> </div> |