hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Temporarily link "settings" to the static version of the form

signup-info-prompt
Eugen Rochko 2016-09-23 21:59:21 +02:00
parent 0c75ce1122
commit 95d72b2249
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,14 +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 style={{ borderTop: '1px solid #363c4b', borderBottom: '1px solid #363c4b', padding: '10px', lineHeight: '36px' }}> <div style={{ borderTop: '1px solid #363c4b', borderBottom: '1px solid #363c4b', padding: '10px', lineHeight: '36px' }}>
{actionButton} {actionButton} {followBack}
{followBack}
</div> </div>
); );
}, },

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

@ -19,7 +19,7 @@ const NavigationBar = React.createClass({
<div style={{ flex: '1 1 auto', marginLeft: '8px' }}> <div style={{ flex: '1 1 auto', marginLeft: '8px' }}>
<strong style={{ fontWeight: '500', display: 'block' }}>{this.props.account.get('acct')}</strong> <strong style={{ fontWeight: '500', display: 'block' }}>{this.props.account.get('acct')}</strong>
<Link to='/settings' style={{ color: '#9baec8', textDecoration: 'none' }}>Settings <i className='fa fa fa-cog' /></Link> <a href='/settings' style={{ color: '#9baec8', textDecoration: 'none' }}>Settings <i className='fa fa fa-cog' /></a>
</div> </div>
</div> </div>
); );