diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-10-19 18:20:19 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-10-19 18:20:19 +0200 |
| commit | 04bbc576906ff70feed7d42fef0e6db17fdd9ed3 (patch) | |
| tree | 789e41ff1abc26044dd230ca05b0aa517e98c453 /app/assets/javascripts/components/features/account | |
| parent | 8698cd3281ac1d699c723a151b14f1e2f2e8b07e (diff) | |
Fix #100 - Add "back" button to certain views
Also fix reloading of timelines after merge-type events
Diffstat (limited to 'app/assets/javascripts/components/features/account')
| -rw-r--r-- | app/assets/javascripts/components/features/account/components/header.jsx | 6 | ||||
| -rw-r--r-- | app/assets/javascripts/components/features/account/index.jsx | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/app/assets/javascripts/components/features/account/components/header.jsx b/app/assets/javascripts/components/features/account/components/header.jsx index 681b30ca8..d794a0aaf 100644 --- a/app/assets/javascripts/components/features/account/components/header.jsx +++ b/app/assets/javascripts/components/features/account/components/header.jsx @@ -26,16 +26,16 @@ const Header = React.createClass({ return ( <div style={{ flex: '0 0 auto', background: '#2f3441', textAlign: 'center', backgroundImage: `url(${account.get('header')})`, backgroundSize: 'cover', position: 'relative' }}> - <div style={{ background: 'rgba(47, 52, 65, 0.8)', padding: '30px 10px' }}> + <div style={{ background: 'rgba(47, 52, 65, 0.8)', padding: '20px 10px' }}> <a href={account.get('url')} target='_blank' rel='noopener' style={{ display: 'block', color: 'inherit', textDecoration: 'none' }}> - <div style={{ width: '90px', margin: '0 auto', marginBottom: '15px' }}> + <div style={{ width: '90px', margin: '0 auto', marginBottom: '10px' }}> <img src={account.get('avatar')} alt='' style={{ display: 'block', width: '90px', height: '90px', borderRadius: '90px' }} /> </div> <span style={{ display: 'inline-block', color: '#fff', fontSize: '20px', lineHeight: '27px', fontWeight: '500' }}>{displayName}</span> </a> - <span style={{ fontSize: '14px', fontWeight: '400', display: 'block', color: '#2b90d9', marginBottom: '15px' }}>@{account.get('acct')}</span> + <span style={{ fontSize: '14px', fontWeight: '400', display: 'block', color: '#2b90d9', marginBottom: '10px' }}>@{account.get('acct')}</span> <p style={{ color: '#616b86', fontSize: '14px' }}>{account.get('note')}</p> {info} diff --git a/app/assets/javascripts/components/features/account/index.jsx b/app/assets/javascripts/components/features/account/index.jsx index 22e02ff54..83770eb74 100644 --- a/app/assets/javascripts/components/features/account/index.jsx +++ b/app/assets/javascripts/components/features/account/index.jsx @@ -18,6 +18,7 @@ import { import LoadingIndicator from '../../components/loading_indicator'; import ActionBar from './components/action_bar'; import Column from '../ui/components/column'; +import ColumnBackButton from '../../components/column_back_button'; const mapStateToProps = (state, props) => ({ account: getAccount(state, Number(props.params.accountId)), @@ -74,6 +75,7 @@ const Account = React.createClass({ return ( <Column> + <ColumnBackButton /> <Header account={account} me={me} /> <ActionBar account={account} me={me} onFollow={this.handleFollow} onBlock={this.handleBlock} /> |