Merge remote-tracking branch 'origin/develop' into jryans/rework-linting-2
This commit is contained in:
commit
782e793925
13 changed files with 8 additions and 606 deletions
|
@ -16,7 +16,6 @@ limitations under the License.
|
|||
|
||||
import React from 'react';
|
||||
import PropTypes from 'prop-types';
|
||||
import * as sdk from '../../../index';
|
||||
import { replaceableComponent } from "../../../utils/replaceableComponent";
|
||||
|
||||
/*
|
||||
|
@ -35,8 +34,7 @@ export default class SimpleRoomHeader extends React.Component {
|
|||
render() {
|
||||
let icon;
|
||||
if (this.props.icon) {
|
||||
const TintableSvg = sdk.getComponent('elements.TintableSvg');
|
||||
icon = <TintableSvg
|
||||
icon = <img
|
||||
className="mx_RoomHeader_icon" src={this.props.icon}
|
||||
width="25" height="25"
|
||||
/>;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue