treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

[Glitch] Fix style of legacy column headers 

Backports daefbd66a6
remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
Thibaut Girka 2018-03-28 17:13:13 +02:00
parent 63d671b18f
commit 259bc9840b
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/javascript/flavours/glitch/features/ui/components/column_header.js
View File

@ -1,5 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import classNames from 'classnames';
export default class ColumnHeader extends React.PureComponent {
@ -16,19 +17,20 @@ export default class ColumnHeader extends React.PureComponent {
}
render () {
const { type, active, columnHeaderId } = this.props;
const { icon, type, active, columnHeaderId } = this.props;
let iconElement = '';
let icon = '';
if (this.props.icon) {
icon = <i className={`fa fa-fw fa-${this.props.icon} column-header__icon`} />;
if (icon) {
iconElement = <i className={`fa fa-fw fa-${icon} column-header__icon`} />;
}
return (
<div role='heading' tabIndex='0' className={`column-header ${active ? 'active' : ''}`} onClick={this.handleClick} id={columnHeaderId || null}>
{icon}
{type}
</div>
<h1 className={classNames('column-header', { active })} id={columnHeaderId || null}>
<button onClick={this.handleClick}>
{iconElement}
{type}
</button>
</h1>
);
}