mastofe

commit: b8eda3026f2947fc7ac2c60df2878209e7327480
parent: 447033038549495318f7c218941829e845aabb61
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Sun, 16 Oct 2016 17:09:00 +0200

Fix scrolling on small devices for account timelines and compose column

Diffstat:
M
app/assets/javascripts/components/features/account/index.jsx
8
+++-----
M
app/assets/javascripts/components/features/ui/components/drawer.jsx
3
++-

2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/app/assets/javascripts/components/features/account/index.jsx b/app/assets/javascripts/components/features/account/index.jsx
@@ -74,13 +74,11 @@ const Account = React.createClass({
 
     return (
       <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}
-        </div>
+        {this.props.children}
       </Column>
     );
   }
diff --git a/app/assets/javascripts/components/features/ui/components/drawer.jsx b/app/assets/javascripts/components/features/ui/components/drawer.jsx
@@ -5,7 +5,8 @@ const style = {
   background: '#454b5e',
   padding: '0',
   display: 'flex',
-  flexDirection: 'column'
+  flexDirection: 'column',
+  overflowY: 'auto'
 };
 
 const Drawer = React.createClass({