diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-09-23 21:52:28 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-09-23 21:52:28 +0200 |
| commit | 0c75ce11229e65023cb91022fedf75acf3f8f062 (patch) | |
| tree | 02510b6033f7f945c46ca9ee04aa1a3aa26f80d5 /app/assets/javascripts/components | |
| parent | 3f9708edc4cd799afb68000adc35036dd8b8faa5 (diff) | |
Improved ColumnsArea on smaller windows, improved how ActionBar looks
Diffstat (limited to 'app/assets/javascripts/components')
3 files changed, 4 insertions, 6 deletions
diff --git a/app/assets/javascripts/components/features/account/components/action_bar.jsx b/app/assets/javascripts/components/features/account/components/action_bar.jsx index a6eb01d61..3522e2e7c 100644 --- a/app/assets/javascripts/components/features/account/components/action_bar.jsx +++ b/app/assets/javascripts/components/features/account/components/action_bar.jsx @@ -29,15 +29,13 @@ const ActionBar = React.createClass({ } if (account.getIn(['relationship', 'followed_by'])) { - followBack = 'follows you'; + followBack = 'Follows you'; } } return ( - <div> + <div style={{ borderTop: '1px solid #363c4b', borderBottom: '1px solid #363c4b', padding: '10px', lineHeight: '36px' }}> {actionButton} - {account.get('followers_count')} followers - {account.get('following_count')} following {followBack} </div> ); diff --git a/app/assets/javascripts/components/features/ui/components/column.jsx b/app/assets/javascripts/components/features/ui/components/column.jsx index 7109bcc19..8d29243cf 100644 --- a/app/assets/javascripts/components/features/ui/components/column.jsx +++ b/app/assets/javascripts/components/features/ui/components/column.jsx @@ -61,7 +61,7 @@ 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', display: 'flex', flexDirection: 'column' }; + const style = { width: '350px', 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}> diff --git a/app/assets/javascripts/components/features/ui/components/columns_area.jsx b/app/assets/javascripts/components/features/ui/components/columns_area.jsx index e45a6466d..fa4c1a9c9 100644 --- a/app/assets/javascripts/components/features/ui/components/columns_area.jsx +++ b/app/assets/javascripts/components/features/ui/components/columns_area.jsx @@ -6,7 +6,7 @@ const ColumnsArea = React.createClass({ render () { return ( - <div style={{ display: 'flex', flexDirection: 'row', flex: '1', marginRight: '10px' }}> + <div style={{ display: 'flex', flexDirection: 'row', flex: '1', marginRight: '10px', marginBottom: '10px', overflowX: 'auto' }}> {this.props.children} </div> ); |