Merge branch 'master' into master

2017-04-05 10:07:17 +02:00
parent 3ec221d3b7 ccb6a658fd
commit 20b53e6add
57 changed files with 570 additions and 164 deletions
--- a/app/assets/javascripts/components/features/notifications/components/clear_column_button.jsx
+++ b/app/assets/javascripts/components/features/notifications/components/clear_column_button.jsx
@ -9,7 +9,7 @@ const iconStyle = {
 };

 const ClearColumnButton = ({ onClick }) => (
-  <div className='column-icon' style={iconStyle} onClick={onClick}>
+  <div className='column-icon' tabindex='0' style={iconStyle} onClick={onClick}>
    <i className='fa fa-trash' />
  </div>
 );