tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding public timeline

Browse Source
This commit is contained in:
Eugen Rochko
2016-10-07 16:00:11 +02:00
parent 06016453bd
commit 1f650d327d
21 changed files with 229 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/components/features/ui/components/column.jsx
View File

@ -29,7 +29,6 @@ const scrollTop = (node) => {
};
};
const Column = React.createClass({
propTypes: {
@ -50,10 +49,6 @@ const Column = React.createClass({
}
},
handleScroll () {
// todo
},
render () {
let header = '';
@ -61,10 +56,10 @@ const Column = React.createClass({
header = <ColumnHeader icon={this.props.icon} type={this.props.heading} onClick={this.handleHeaderClick} />;
}
const style = { width: '350px', flex: '0 0 auto', background: '#282c37', margin: '10px', marginRight: '0', marginBottom: '0', display: 'flex', flexDirection: 'column' };
const style = { width: '330px', flex: '0 0 auto', background: '#282c37', margin: '10px', marginRight: '0', marginBottom: '0', display: 'flex', flexDirection: 'column' };
return (
<div style={style} onWheel={this.handleWheel} onScroll={this.handleScroll}>
<div style={style} onWheel={this.handleWheel}>
{header}
{this.props.children}
</div>

2
app/assets/javascripts/components/features/ui/components/columns_area.jsx
View File

@ -6,7 +6,7 @@ const ColumnsArea = React.createClass({
render () {
return (
<div style={{ display: 'flex', flexDirection: 'row', flex: '1', marginRight: '10px', marginBottom: '10px', overflowX: 'auto' }}>
<div style={{ display: 'flex', flexDirection: 'row', flex: '1', justifyContent: 'flex-start', marginRight: '10px', marginBottom: '10px', overflowX: 'auto' }}>
{this.props.children}
</div>
);

2
app/assets/javascripts/components/features/ui/components/navigation_bar.jsx
View File

@ -19,7 +19,7 @@ const NavigationBar = React.createClass({
<div style={{ flex: '1 1 auto', marginLeft: '8px', color: '#9baec8' }}>
<strong style={{ fontWeight: '500', display: 'block', color: '#fff' }}>{this.props.account.get('acct')}</strong>
<a href='/settings' style={{ color: 'inherit', textDecoration: 'none' }}>Settings</a> · <a href='/auth/sign_out' data-method='delete' style={{ color: 'inherit', textDecoration: 'none' }}>Logout</a>
<a href='/settings' style={{ color: 'inherit', textDecoration: 'none' }}>Settings</a> · <Link to='/statuses/all' style={{ color: 'inherit', textDecoration: 'none' }}>Public timeline</Link> · <a href='/auth/sign_out' data-method='delete' style={{ color: 'inherit', textDecoration: 'none' }}>Logout</a>
</div>
</div>
);

4
app/assets/javascripts/components/features/ui/index.jsx
View File

@ -40,9 +40,7 @@ const UI = React.createClass({
<StatusListContainer type='mentions' />
</Column>
<Column>
{this.props.children}
</Column>
{this.props.children}
</ColumnsArea>
<NotificationsContainer />