about summary refs log tree commit diff
path: root/app/assets/javascripts/components/features/account
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-10-16 17:09:00 +0200
committerEugen Rochko <eugen@zeonfederated.com>2016-10-16 17:09:00 +0200
commitb8eda3026f2947fc7ac2c60df2878209e7327480 (patch)
tree5259462a652cef64d08c0820444ab6ea82458241 /app/assets/javascripts/components/features/account
parent447033038549495318f7c218941829e845aabb61 (diff)
Fix scrolling on small devices for account timelines and compose column
Diffstat (limited to 'app/assets/javascripts/components/features/account')
-rw-r--r--app/assets/javascripts/components/features/account/index.jsx8
1 files changed, 3 insertions, 5 deletions
diff --git a/app/assets/javascripts/components/features/account/index.jsx b/app/assets/javascripts/components/features/account/index.jsx
index cdda4ff2f..22e02ff54 100644
--- 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>
     );
   }