diff options
Diffstat (limited to 'app/assets/javascripts/components')
4 files changed, 2 insertions, 7 deletions
diff --git a/app/assets/javascripts/components/components/status_content.jsx b/app/assets/javascripts/components/components/status_content.jsx index bf1ba54fc..357465248 100644 --- a/app/assets/javascripts/components/components/status_content.jsx +++ b/app/assets/javascripts/components/components/status_content.jsx @@ -22,11 +22,11 @@ const StatusContent = React.createClass({ let mention = this.props.status.get('mentions').find(item => link.href === item.get('url')); if (mention) { - link.addEventListener('click', this.onMentionClick.bind(this, mention)); + link.addEventListener('click', this.onMentionClick.bind(this, mention), false); } else { link.setAttribute('target', '_blank'); link.setAttribute('rel', 'noopener'); - link.addEventListener('click', this.onNormalClick); + link.addEventListener('click', this.onNormalClick, false); } } }, diff --git a/app/assets/javascripts/components/features/ui/components/column.jsx b/app/assets/javascripts/components/features/ui/components/column.jsx index be4fa8908..c2060749a 100644 --- a/app/assets/javascripts/components/features/ui/components/column.jsx +++ b/app/assets/javascripts/components/features/ui/components/column.jsx @@ -30,9 +30,7 @@ const scrollTop = (node) => { }; const style = { - height: '100%', boxSizing: 'border-box', - flex: '0 0 auto', background: '#282c37', display: 'flex', flexDirection: 'column' 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 3f88b1ea3..8d316e26b 100644 --- a/app/assets/javascripts/components/features/ui/components/columns_area.jsx +++ b/app/assets/javascripts/components/features/ui/components/columns_area.jsx @@ -3,7 +3,6 @@ import PureRenderMixin from 'react-addons-pure-render-mixin'; const style = { display: 'flex', flex: '1 1 auto', - flexDirection: 'row', justifyContent: 'flex-start', overflowX: 'auto' }; diff --git a/app/assets/javascripts/components/features/ui/components/drawer.jsx b/app/assets/javascripts/components/features/ui/components/drawer.jsx index 1fbb9333e..8966602e2 100644 --- a/app/assets/javascripts/components/features/ui/components/drawer.jsx +++ b/app/assets/javascripts/components/features/ui/components/drawer.jsx @@ -1,8 +1,6 @@ import PureRenderMixin from 'react-addons-pure-render-mixin'; const style = { - height: '100%', - flex: '0 0 auto', boxSizing: 'border-box', background: '#454b5e', padding: '0', |