From 0c75ce11229e65023cb91022fedf75acf3f8f062 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Fri, 23 Sep 2016 21:52:28 +0200 Subject: [PATCH] Improved ColumnsArea on smaller windows, improved how ActionBar looks --- .../components/features/account/components/action_bar.jsx | 6 ++---- .../components/features/ui/components/column.jsx | 2 +- .../components/features/ui/components/columns_area.jsx | 2 +- 3 files changed, 4 insertions(+), 6 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 a6eb01d618..3522e2e7cd 100644 --- a/app/assets/javascripts/components/features/account/components/action_bar.jsx +++ b/app/assets/javascripts/components/features/account/components/action_bar.jsx @@ -29,15 +29,13 @@ const ActionBar = React.createClass({ } if (account.getIn(['relationship', 'followed_by'])) { - followBack = 'follows you'; + followBack = 'Follows you'; } } return ( -
+
{actionButton} - {account.get('followers_count')} followers - {account.get('following_count')} following {followBack}
); diff --git a/app/assets/javascripts/components/features/ui/components/column.jsx b/app/assets/javascripts/components/features/ui/components/column.jsx index 7109bcc19e..8d29243cff 100644 --- a/app/assets/javascripts/components/features/ui/components/column.jsx +++ b/app/assets/javascripts/components/features/ui/components/column.jsx @@ -61,7 +61,7 @@ const Column = React.createClass({ header = ; } - 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 (
diff --git a/app/assets/javascripts/components/features/ui/components/columns_area.jsx b/app/assets/javascripts/components/features/ui/components/columns_area.jsx index e45a6466d4..fa4c1a9c93 100644 --- a/app/assets/javascripts/components/features/ui/components/columns_area.jsx +++ b/app/assets/javascripts/components/features/ui/components/columns_area.jsx @@ -6,7 +6,7 @@ const ColumnsArea = React.createClass({ render () { return ( -
+
{this.props.children}
);