Merge pull request #1793 from matrix-org/luke/fix-tag-panel-clear-filter-tinting

Use TintableSvg for TagPanel clear filter button
pull/21833/head
David Baker 2018-03-08 17:30:17 +00:00 committed by GitHub
commit e87f8ee7b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions

View File

@ -101,6 +101,7 @@ const TagPanel = React.createClass({
const GroupsButton = sdk.getComponent('elements.GroupsButton'); const GroupsButton = sdk.getComponent('elements.GroupsButton');
const DNDTagTile = sdk.getComponent('elements.DNDTagTile'); const DNDTagTile = sdk.getComponent('elements.DNDTagTile');
const AccessibleButton = sdk.getComponent('elements.AccessibleButton'); const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
const TintableSvg = sdk.getComponent('elements.TintableSvg');
const tags = this.state.orderedTags.map((tag, index) => { const tags = this.state.orderedTags.map((tag, index) => {
return <DNDTagTile return <DNDTagTile
@ -112,12 +113,10 @@ const TagPanel = React.createClass({
}); });
const clearButton = this.state.selectedTags.length > 0 ? const clearButton = this.state.selectedTags.length > 0 ?
<img <TintableSvg src="img/icons-close.svg" width="24" height="24"
src="img/icons-close.svg"
alt={_t("Clear filter")} alt={_t("Clear filter")}
title={_t("Clear filter")} title={_t("Clear filter")}
width="24" /> :
height="24" /> :
<div />; <div />;
return <div className="mx_TagPanel"> return <div className="mx_TagPanel">