Skip to content

Commit 4ff2e5a

Browse files
committed
make compatiable with font awesome
1 parent 5758b7d commit 4ff2e5a

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

src/Notification.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const notice = (type, msg, title) => {
66
const bodyHTML = `
77
${ titleHTML }
88
<div>
9-
<span class=' glyphicon glyphicon-alert'></span>&nbsp;
9+
<span class='fa fa-exclamation-triangle glyphicon glyphicon-alert'></span>&nbsp;
1010
<span>${ msg }</span>
1111
</div>
1212
`;

src/TableBody.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -472,8 +472,8 @@ class TableBody extends Component {
472472
if (CustomComponent) {
473473
content = (<CustomComponent isExpandableRow={ isExpandableRow } isExpanded={ isExpanded } />);
474474
} else if (isExpandableRow) {
475-
content = (isExpanded ? (<span className='glyphicon glyphicon-minus'></span>) :
476-
(<span className='glyphicon glyphicon-plus'></span>) );
475+
content = (isExpanded ? (<span className='fa fa-minus glyphicon glyphicon-minus'></span>) :
476+
(<span className='fa fa-plus glyphicon glyphicon-plus'></span>) );
477477
} else {
478478
content = ' ';
479479
}

src/toolbar/DeleteButton.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class DeleteButton extends Component {
1616
...rest
1717
} = this.props;
1818
const content = children ||
19-
(<span><i className={ `glyphicon ${btnGlyphicon}` }></i> { btnText }</span>);
19+
(<span><i className={ `fa glyphicon ${btnGlyphicon}` }></i> { btnText }</span>);
2020
return (
2121
<button type='button'
2222
className={ `btn ${btnContextual} ${deleteBtnDefaultClass} ${className}` }
@@ -40,7 +40,7 @@ DeleteButton.defaultProps = {
4040
btnContextual: 'btn-warning',
4141
className: '',
4242
onClick: undefined,
43-
btnGlyphicon: 'glyphicon-trash'
43+
btnGlyphicon: 'glyphicon-trash fa-trash'
4444
};
4545

4646
export default DeleteButton;

src/toolbar/ExportCSVButton.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class ExportCSVButton extends Component {
1616
...rest
1717
} = this.props;
1818
const content = children ||
19-
(<span><i className={ `glyphicon ${btnGlyphicon}` }></i> { btnText }</span>);
19+
(<span><i className={ `fa glyphicon ${btnGlyphicon}` }></i> { btnText }</span>);
2020
return (
2121
<button type='button'
2222
className={ `btn ${btnContextual} ${exportCsvBtnDefaultClass} ${className} hidden-print` }
@@ -40,7 +40,7 @@ ExportCSVButton.defaultProps = {
4040
btnContextual: 'btn-success',
4141
className: '',
4242
onClick: undefined,
43-
btnGlyphicon: 'glyphicon-export'
43+
btnGlyphicon: 'glyphicon-export fa-download'
4444
};
4545

4646
export default ExportCSVButton;

src/toolbar/InsertButton.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class InsertButton extends Component {
1616
...rest
1717
} = this.props;
1818
const content = children ||
19-
(<span><i className={ `glyphicon ${btnGlyphicon}` }></i>{ btnText }</span>);
19+
(<span><i className={ `fa glyphicon ${btnGlyphicon}` }></i> { btnText }</span>);
2020
return (
2121
<button type='button'
2222
className={ `btn ${btnContextual} ${insertBtnDefaultClass} ${className}` }
@@ -40,7 +40,7 @@ InsertButton.defaultProps = {
4040
btnContextual: 'btn-info',
4141
className: '',
4242
onClick: undefined,
43-
btnGlyphicon: 'glyphicon-plus'
43+
btnGlyphicon: 'glyphicon-plus fa-plus'
4444
};
4545

4646
export default InsertButton;

0 commit comments

Comments
 (0)