matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-14 19:02:33 +03:00
Code Activity

Fix pills.

Browse Source 
This was a hard pill to swallow
This commit is contained in:
Jorik Schellekens
2020-04-03 17:53:49 +01:00
parent f10d9e47e7
commit 1ff0f3445a
4 changed files with 43 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/components/views/avatars/BaseAvatar.js
View File

@@ -164,9 +164,9 @@ export default createReactClass({
const initialLetter = AvatarLogic.getInitialLetter(name);
const textNode = (
<span className="mx_BaseAvatar_initial" aria-hidden="true"
style={{ fontSize: (width * 0.65) + "px",
width: width + "px",
lineHeight: height + "px" }}
style={{ fontSize: (width * 0.65) / 15 + "rem",
width: width / 15 + "rem",
lineHeight: height / 15 + "rem" }}
>
{ initialLetter }
</span>
@@ -174,7 +174,11 @@ export default createReactClass({
const imgNode = (
<img className="mx_BaseAvatar_image" src={imageUrl}
alt="" title={title} onError={this.onError}
width={width} height={height} aria-hidden="true" />
aria-hidden="true"
style={{
width: width/15 + "rem",
height: height/15 + "rem"
}} />
);
if (onClick != null) {
return (
@@ -202,7 +206,10 @@ export default createReactClass({
src={imageUrl}
onClick={onClick}
onError={this.onError}
width={width} height={height}
style={{
width: width/15 + "rem",
height: height/15 + "rem"
}}
title={title} alt=""
inputRef={inputRef}
{...otherProps} />
@@ -213,7 +220,10 @@ export default createReactClass({
className="mx_BaseAvatar mx_BaseAvatar_image"
src={imageUrl}
onError={this.onError}
width={width} height={height}
style={{
width: width/15 + "rem",
height: height/15 + "rem"
}}
title={title} alt=""
ref={inputRef}
{...otherProps} />