mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-21 12:05:07 +01:00
Code Issues Projects Releases Wiki Activity

Add icons to column headers, click them to scroll to top

Browse Source
This commit is contained in:
Eugen Rochko 2016-09-06 00:44:28 +02:00
parent 1f18cf97b5
commit ac77170d19
4 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/components/components/column.jsx
View File

@ -5,15 +5,21 @@ import PureRenderMixin from 'react-addons-pure-render-mixin';
const Column = React.createClass({
propTypes: {
type: React.PropTypes.string
type: React.PropTypes.string,
icon: React.PropTypes.string
},
mixins: [PureRenderMixin],
handleHeaderClick () {
let node = ReactDOM.findDOMNode(this);
node.querySelector('.scrollable').scrollTo(0, 0);
},
render () {
return (
<div style={{ width: '380px', flex: '0 0 auto', background: '#282c37', margin: '10px', marginRight: '0', display: 'flex', flexDirection: 'column' }}>
<ColumnHeader type={this.props.type} />
<ColumnHeader icon={this.props.icon} type={this.props.type} onClick={this.handleHeaderClick} />
<StatusListContainer type={this.props.type} />
</div>
);

17
app/assets/javascripts/components/components/column_header.jsx
View File

@ -3,14 +3,27 @@ import PureRenderMixin from 'react-addons-pure-render-mixin';
const ColumnHeader = React.createClass({
propTypes: {
type: React.PropTypes.string
icon: React.PropTypes.string,
type: React.PropTypes.string,
onClick: React.PropTypes.func
},
mixins: [PureRenderMixin],
handleClick () {
this.props.onClick();
},
render () {
let icon = '';
if (this.props.icon) {
icon = <i className={`fa fa-fw fa-${this.props.icon}`} style={{ display: 'inline-block', marginRight: '5px' }} />;
}
return (
<div style={{ padding: '15px', fontSize: '16px', background: '#2f3441', flex: '0 0 auto' }}>
<div onClick={this.handleClick} style={{ padding: '15px', fontSize: '16px', background: '#2f3441', flex: '0 0 auto', cursor: 'pointer' }}>
{icon}
{this.props.type}
</div>
);

4
app/assets/javascripts/components/components/columns_area.jsx
View File

@ -8,8 +8,8 @@ const ColumnsArea = React.createClass({
render () {
return (
<div style={{ display: 'flex', flexDirection: 'row', flex: '1' }}>
<Column type='home' />
<Column type='mentions' />
<Column icon='home' type='home' />
<Column icon='at' type='mentions' />
</div>
);
}

2
app/assets/javascripts/components/components/status_list.jsx
View File

@ -15,7 +15,7 @@ const StatusList = React.createClass({
render () {
return (
<div style={{ overflowY: 'scroll', flex: '1 1 auto' }}>
<div style={{ overflowY: 'scroll', flex: '1 1 auto' }} className='scrollable'>
<div>
{this.props.statuses.map((status) => {
return <Status key={status.get('id')} status={status} onReply={this.props.onReply} onReblog={this.props.onReblog} onFavourite={this.props.onFavourite} />;