treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Improved ColumnsArea on smaller windows, improved how ActionBar looks

remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
Eugen Rochko 2016-09-23 21:52:28 +02:00
parent 3f9708edc4
commit 0c75ce1122
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/components/features/account/components/action_bar.jsx
View File

@ -29,15 +29,13 @@ const ActionBar = React.createClass({
} }
if (account.getIn(['relationship', 'followed_by'])) { if (account.getIn(['relationship', 'followed_by'])) {
followBack = 'follows you'; followBack = 'Follows you';
} }
} }
return ( return (
<div> <div style={{ borderTop: '1px solid #363c4b', borderBottom: '1px solid #363c4b', padding: '10px', lineHeight: '36px' }}>
{actionButton} {actionButton}
{account.get('followers_count')} followers
{account.get('following_count')} following
{followBack} {followBack}
</div> </div>
); );

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

@ -61,7 +61,7 @@ const Column = React.createClass({
header = <ColumnHeader icon={this.props.icon} type={this.props.heading} onClick={this.handleHeaderClick} />; 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 ( return (
<div style={style} onWheel={this.handleWheel} onScroll={this.handleScroll}> <div style={style} onWheel={this.handleWheel} onScroll={this.handleScroll}>

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

@ -6,7 +6,7 @@ const ColumnsArea = React.createClass({
render () { render () {
return ( 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} {this.props.children}
</div> </div>
); );