gearheads/mastodon
Archived
2
0
Fork 0
Code Releases 4 Activity

Merge and unmerge timelines on follow/unfollow, solves #21, #22

Browse source
This commit is contained in:
Eugen Rochko 2016-09-10 18:36:48 +02:00
parent 35b6c4b36a
commit 0077fc26df
13 changed files with 133 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app/assets/javascripts/components/components/column.jsx
View file

@ -1,11 +1,10 @@
import StatusListContainer from '../containers/status_list_container';
import ColumnHeader from './column_header';
import PureRenderMixin from 'react-addons-pure-render-mixin';
import ColumnHeader from './column_header';
import PureRenderMixin from 'react-addons-pure-render-mixin';
const Column = React.createClass({
propTypes: {
type: React.PropTypes.string,
heading: React.PropTypes.string,
icon: React.PropTypes.string
},
@ -17,10 +16,16 @@ const Column = React.createClass({
},
render () {
let header = '';
if (this.props.heading) {
header = <ColumnHeader icon={this.props.icon} type={this.props.heading} onClick={this.handleHeaderClick} />;
}
return (
<div style={{ width: '380px', flex: '0 0 auto', background: '#282c37', margin: '10px', marginRight: '0', display: 'flex', flexDirection: 'column' }}>
<ColumnHeader icon={this.props.icon} type={this.props.type} onClick={this.handleHeaderClick} />
<StatusListContainer type={this.props.type} />
{header}
{this.props.children}
</div>
);
}