ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix scrolling on small devices for account timelines and compose column

rebase/4.0.0rc2
Eugen Rochko 2016-10-16 17:09:00 +02:00
parent 4470330385
commit b8eda3026f
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/components/features/account/index.jsx
View File

@ -74,13 +74,11 @@ const Account = React.createClass({
return ( return (
<Column> <Column>
<div style={{ display: 'flex', flexDirection: 'column', 'flex': '0 0 auto', height: '100%' }}> <Header account={account} me={me} />
<Header account={account} me={me} />
<ActionBar account={account} me={me} onFollow={this.handleFollow} onBlock={this.handleBlock} /> <ActionBar account={account} me={me} onFollow={this.handleFollow} onBlock={this.handleBlock} />
{this.props.children} {this.props.children}
</div>
</Column> </Column>
); );
} }

3
app/assets/javascripts/components/features/ui/components/drawer.jsx
View File

@ -5,7 +5,8 @@ const style = {
background: '#454b5e', background: '#454b5e',
padding: '0', padding: '0',
display: 'flex', display: 'flex',
flexDirection: 'column' flexDirection: 'column',
overflowY: 'auto'
}; };
const Drawer = React.createClass({ const Drawer = React.createClass({