mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-27 03:30:28 +02:00
Code Issues Releases Wiki Activity

Finish admin permissions page and clean up everything

Browse Source
This commit is contained in:
Toby Zerner
2015-07-31 20:16:47 +09:30
parent 5706c71c86
commit fde7afd3e2
33 changed files with 766 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/lib/components/Button.js
View File

@@ -49,7 +49,7 @@ export default class Button extends Component {
const iconName = this.props.icon;
return [
iconName ? icon(iconName, {className: 'Button-icon'}) : '', ' ',
iconName && iconName !== true ? icon(iconName, {className: 'Button-icon'}) : '',
this.props.children ? <span className="Button-label">{this.props.children}</span> : '',
this.props.loading ? LoadingIndicator.component({size: 'tiny', className: 'LoadingIndicator--inline'}) : ''
];