Merge remote-tracking branch 'origin/develop' into develop

pull/21833/head
Weblate 2018-03-08 17:30:21 +00:00
commit 9524d1c313
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 DNDTagTile = sdk.getComponent('elements.DNDTagTile');
const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
const TintableSvg = sdk.getComponent('elements.TintableSvg');
const tags = this.state.orderedTags.map((tag, index) => {
return <DNDTagTile
@ -112,12 +113,10 @@ const TagPanel = React.createClass({
});
const clearButton = this.state.selectedTags.length > 0 ?
<img
src="img/icons-close.svg"
<TintableSvg src="img/icons-close.svg" width="24" height="24"
alt={_t("Clear filter")}
title={_t("Clear filter")}
width="24"
height="24" /> :
/> :
<div />;
return <div className="mx_TagPanel">