mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-25 18:55:58 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop

Browse source
This commit is contained in:
Luke Barnard 2017-10-23 14:57:50 +01:00
commit 03f4e6c622
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/UserSettingsStore.js
View file

@ -40,7 +40,7 @@ export default {
getLabsFeatures() { getLabsFeatures() {
const featuresConfig = SdkConfig.get()['features'] || {}; const featuresConfig = SdkConfig.get()['features'] || {};
// The old flag: honourned for backwards compat // The old flag: honoured for backwards compatibility
const enableLabs = SdkConfig.get()['enableLabs']; const enableLabs = SdkConfig.get()['enableLabs'];
let labsFeatures; let labsFeatures;
@ -217,7 +217,7 @@ export default {
isFeatureEnabled: function(featureId: string): boolean { isFeatureEnabled: function(featureId: string): boolean {
const featuresConfig = SdkConfig.get()['features']; const featuresConfig = SdkConfig.get()['features'];
// The old flag: honourned for backwards compat // The old flag: honoured for backwards compatibility
const enableLabs = SdkConfig.get()['enableLabs']; const enableLabs = SdkConfig.get()['enableLabs'];
let sdkConfigValue = enableLabs ? 'labs' : 'disable'; let sdkConfigValue = enableLabs ? 'labs' : 'disable';

6
src/components/views/elements/Flair.js
View file

@ -42,11 +42,11 @@ class FlairAvatar extends React.Component {
render() { render() {
const httpUrl = this.context.matrixClient.mxcUrlToHttp( const httpUrl = this.context.matrixClient.mxcUrlToHttp(
this.props.groupProfile.avatarUrl, 14, 14, 'scale', false); this.props.groupProfile.avatarUrl, 16, 16, 'scale', false);
return <img return <img
src={httpUrl} src={httpUrl}
width="14px" width="16"
height="14px" height="16"
onClick={this.onClick} onClick={this.onClick}
title={this.props.groupProfile.groupId} />; title={this.props.groupProfile.groupId} />;
} }