OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Read the icon from the right place 

Also don't define image widths in the HTML as it's done in the CSS.
pull/2750/head
David Baker 2016-12-16 10:12:49 +00:00
parent e607f49ae6
commit fb08910db3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/views/directory/NetworkDropdown.js
View File

@ -197,7 +197,7 @@ export default class NetworkDropdown extends React.Component {
if (handleClicks === undefined) handleClicks = true; if (handleClicks === undefined) handleClicks = true;
const name = instance.desc; const name = instance.desc;
const icon = <img src={protocol.icon || DEFAULT_ICON_URL} width="16" />; const icon = <img src={instance.icon || DEFAULT_ICON_URL} />;
const key = instance.instance_id; const key = instance.instance_id;
const click_handler = handleClicks ? this.onMenuOptionClickProtocolInstance.bind(this, server, instance.instance_id) : null; const click_handler = handleClicks ? this.onMenuOptionClickProtocolInstance.bind(this, server, instance.instance_id) : null;
@ -218,7 +218,7 @@ export default class NetworkDropdown extends React.Component {
span_class = 'mx_NetworkDropdown_menu_all'; span_class = 'mx_NetworkDropdown_menu_all';
} else if (network == '_matrix') { } else if (network == '_matrix') {
name = 'Matrix'; name = 'Matrix';
icon = <img src="img/network-matrix.svg" width="16" height="16" />; icon = <img src="img/network-matrix.svg" />;
span_class = 'mx_NetworkDropdown_menu_network'; span_class = 'mx_NetworkDropdown_menu_network';
} else { } else {
if (this.props.config.networks[network] === undefined) { if (this.props.config.networks[network] === undefined) {
@ -232,9 +232,9 @@ export default class NetworkDropdown extends React.Component {
if (this.props.config.networks[network].icon) { if (this.props.config.networks[network].icon) {
// omit height here so if people define a non-square logo in the config, it // omit height here so if people define a non-square logo in the config, it
// will keep the aspect when it scales // will keep the aspect when it scales
icon = <img src={this.props.config.networks[network].icon} width="16" />; icon = <img src={this.props.config.networks[network].icon} />;
} else { } else {
icon = <img src={iconPath} width="16" height="16" />; icon = <img src={iconPath} />;
} }
span_class = 'mx_NetworkDropdown_menu_network'; span_class = 'mx_NetworkDropdown_menu_network';