diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-11-07 01:14:12 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-11-07 01:14:12 +0100 |
| commit | 23fc424b7aea139a0aff5cd347f46c81e50c2c56 (patch) | |
| tree | 47ce5106180cac5ebe93adaa4c91edc2c5ce8b79 /app/assets/javascripts/components | |
| parent | b835f4aa1ce12cc31a721750a857d8d08a50069a (diff) | |
Account notes (bios) can now contain links. Character limit upped to 160
Diffstat (limited to 'app/assets/javascripts/components')
| -rw-r--r-- | app/assets/javascripts/components/features/account/components/header.jsx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/components/features/account/components/header.jsx b/app/assets/javascripts/components/features/account/components/header.jsx index d794a0aaf..39666bdc1 100644 --- a/app/assets/javascripts/components/features/account/components/header.jsx +++ b/app/assets/javascripts/components/features/account/components/header.jsx @@ -24,6 +24,8 @@ const Header = React.createClass({ info = <span style={{ position: 'absolute', top: '10px', right: '10px', opacity: '0.7', display: 'inline-block', verticalAlign: 'top', background: 'rgba(0, 0, 0, 0.4)', color: '#fff', textTransform: 'uppercase', fontSize: '11px', fontWeight: '500', padding: '4px', borderRadius: '4px' }}>Follows you</span> } + const content = { __html: account.get('note') }; + 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: '20px 10px' }}> @@ -36,7 +38,7 @@ const Header = React.createClass({ </a> <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> + <div style={{ color: '#616b86', fontSize: '14px' }} className='account__header__content' dangerouslySetInnerHTML={content} /> {info} </div> |