Improved ColumnsArea on smaller windows, improved how ActionBar looks

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 a6eb01d618ed292ad2347354d13a22a9b86224a1..3522e2e7cd69d4f283336c1d584f0da2db9f019c 100644 (file)
--- 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 (
-      <div>
+      <div style={{ borderTop: '1px solid #363c4b', borderBottom: '1px solid #363c4b', padding: '10px', lineHeight: '36px' }}>
         {actionButton}
-        {account.get('followers_count')} followers
-        {account.get('following_count')} following
         {followBack}
       </div>
     );

diff --git a/app/assets/javascripts/components/features/ui/components/column.jsx b/app/assets/javascripts/components/features/ui/components/column.jsx
index 7109bcc19e9e35d77d63e524198e6389bc851cd6..8d29243cff8f8f1919b84ff75e67d4cc475275a5 100644 (file)
--- 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 = <ColumnHeader icon={this.props.icon} type={this.props.heading} onClick={this.handleHeaderClick} />;
     }
 
-    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 (
       <div style={style} onWheel={this.handleWheel} onScroll={this.handleScroll}>

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 e45a6466d4e16d4abfa29191698a3ac436d278cc..fa4c1a9c93959ad65b331e050850b45e3a4fccde 100644 (file)
--- 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 (
-      <div style={{ display: 'flex', flexDirection: 'row', flex: '1', marginRight: '10px' }}>
+      <div style={{ display: 'flex', flexDirection: 'row', flex: '1', marginRight: '10px', marginBottom: '10px', overflowX: 'auto' }}>
         {this.props.children}
       </div>
     );