diff options
author | Ondřej Hruška <ondra@ondrovo.com> | 2017-07-30 18:36:28 +0200 |
---|---|---|
committer | beatrix <beatrix.bitrot@gmail.com> | 2017-07-30 12:36:28 -0400 |
commit | 6ff084dbbb06e5c2f131546829066435f2bf8f8a (patch) | |
tree | 06386f3ffadc2148b1f49be93cff1eb9ac685262 /app/javascript/mastodon/components/column.js | |
parent | 9aaf3218d24bb8b3eb1de697243c13637398ab46 (diff) |
Improved notifications cleaning UI with set operations (#109)
* added notification cleaning drawer * bugfix * fully implemented set operations for notif cleaning * i18n for notif cleaning drawer & improved logic slightly. Also added a confirm dialog * - notif dismiss "overlay" now shoves the notif aside to avoid overlap - added focus ring to header buttons - removed notif overlay entirely from DOM if mode is disabled * removed comment * CSS tuning - inconsistent division lines fix
Diffstat (limited to 'app/javascript/mastodon/components/column.js')
-rw-r--r-- | app/javascript/mastodon/components/column.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/javascript/mastodon/components/column.js b/app/javascript/mastodon/components/column.js index 93f1d6260..29c8f4389 100644 --- a/app/javascript/mastodon/components/column.js +++ b/app/javascript/mastodon/components/column.js @@ -7,6 +7,7 @@ export default class Column extends React.PureComponent { static propTypes = { children: PropTypes.node, + extraClasses: PropTypes.string, }; scrollTop () { @@ -40,10 +41,10 @@ export default class Column extends React.PureComponent { } render () { - const { children } = this.props; + const { children, extraClasses } = this.props; return ( - <div role='region' className='column' ref={this.setRef}> + <div role='region' className={`column ${extraClasses || ''}`} ref={this.setRef}> {children} </div> ); |