From 95d72b2249e1313182d4ee8b3dbf62666d716585 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 23 Sep 2016 21:59:21 +0200
Subject: [PATCH] Temporarily link "settings" to the static version of the form
---
.../components/features/account/components/action_bar.jsx | 5 ++---
.../components/features/ui/components/navigation_bar.jsx | 2 +-
2 files changed, 3 insertions(+), 4 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 3522e2e7c..9fa9fff3d 100644
--- a/app/assets/javascripts/components/features/account/components/action_bar.jsx
+++ b/app/assets/javascripts/components/features/account/components/action_bar.jsx
@@ -29,14 +29,13 @@ const ActionBar = React.createClass({
}
if (account.getIn(['relationship', 'followed_by'])) {
- followBack = 'Follows you';
+ followBack = 'Follows you!';
}
}
return (
<div style={{ borderTop: '1px solid #363c4b', borderBottom: '1px solid #363c4b', padding: '10px', lineHeight: '36px' }}>
- {actionButton}
- {followBack}
+ {actionButton} {followBack}
</div>
);
},
diff --git a/app/assets/javascripts/components/features/ui/components/navigation_bar.jsx b/app/assets/javascripts/components/features/ui/components/navigation_bar.jsx
index b5d374a88..d53d254c1 100644
--- a/app/assets/javascripts/components/features/ui/components/navigation_bar.jsx
+++ b/app/assets/javascripts/components/features/ui/components/navigation_bar.jsx
@@ -19,7 +19,7 @@ const NavigationBar = React.createClass({
<div style={{ flex: '1 1 auto', marginLeft: '8px' }}>
<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>
);