mirror of
https://github.com/vector-im/element-web.git
synced 2024-09-09 22:55:12 +00:00
Read the icon from the right place
Also don't define image widths in the HTML as it's done in the CSS.
This commit is contained in:
parent
e607f49ae6
commit
fb08910db3
1 changed files with 4 additions and 4 deletions
|
@ -197,7 +197,7 @@ export default class NetworkDropdown extends React.Component {
|
|||
if (handleClicks === undefined) handleClicks = true;
|
||||
|
||||
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 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';
|
||||
} else if (network == '_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';
|
||||
} else {
|
||||
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) {
|
||||
// omit height here so if people define a non-square logo in the config, it
|
||||
// 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 {
|
||||
icon = <img src={iconPath} width="16" height="16" />;
|
||||
icon = <img src={iconPath} />;
|
||||
}
|
||||
|
||||
span_class = 'mx_NetworkDropdown_menu_network';
|
||||
|
|
Loading…
Reference in a new issue