imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider

Browse source
This commit is contained in:
Jorik Schellekens 2020-04-28 15:38:46 +01:00
commit 1b83faaa8d
51 changed files with 1699 additions and 333 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/components/views/avatars/BaseAvatar.js
View file

@ -165,9 +165,11 @@ export default createReactClass({
const initialLetter = AvatarLogic.getInitialLetter(name);
const textNode = (
<span className="mx_BaseAvatar_initial" aria-hidden="true"
style={{ fontSize: toRem(width * 0.65),
width: toRem(width),
lineHeight: toRem(height) }}
style={{
fontSize: toRem(width * 0.65),
width: toRem(width),
lineHeight: toRem(height),
}}
>
{ initialLetter }
</span>
@ -208,8 +210,8 @@ export default createReactClass({
onClick={onClick}
onError={this.onError}
style={{
width: {width},
height: {height},
width: toRem(width),
height: toRem(height),
}}
title={title} alt=""
inputRef={inputRef}
@ -223,7 +225,7 @@ export default createReactClass({
onError={this.onError}
style={{
width: toRem(width),
height: toRem(height)
height: toRem(height),
}}
title={title} alt=""
ref={inputRef}