Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Merge upstream 2.0ish #165

Browse source
This commit is contained in:
kibigo! 2017-10-11 10:43:10 -07:00
commit 8d6b9ba494
322 changed files with 8478 additions and 2587 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/mastodon/components/column_header.js
View file

@ -173,7 +173,7 @@ export default class ColumnHeader extends React.PureComponent {
return (
<div className={wrapperClassName}>
<h1 tabIndex={focusable && '0'} role='button' className={buttonClassName} aria-label={title} onClick={this.handleTitleClick}>
<h1 tabIndex={focusable ? 0 : null} role='button' className={buttonClassName} aria-label={title} onClick={this.handleTitleClick}>
<i className={`fa fa-fw fa-${icon} column-header__icon`} />
{title}
<div className='column-header__buttons'>
@ -200,7 +200,7 @@ export default class ColumnHeader extends React.PureComponent {
</div>
) : null}
<div className={collapsibleClassName} tabIndex={collapsed && -1} onTransitionEnd={this.handleTransitionEnd}>
<div className={collapsibleClassName} tabIndex={collapsed ? -1 : null} onTransitionEnd={this.handleTransitionEnd}>
<div className='column-header__collapsible-inner'>
{(!collapsed || animating) && collapsedContent}
</div>