PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Fix MemberAvatar rendering and thread info color (#7085)

Browse source
This commit is contained in:
Germain 2021-11-04 17:10:22 +00:00 committed by GitHub
parent a76fa5d624
commit aacea8d87b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
res/css/views/rooms/_EventTile.scss
View file

@ -673,7 +673,7 @@ $left-gutter: 64px;
padding-right: 16px;
padding-top: 8px;
padding-bottom: 8px;
font-size: 12px;
font-size: $font-12px;
color: $secondary-content;
box-sizing: border-box;
justify-content: flex-start;
@ -694,6 +694,13 @@ $left-gutter: 64px;
overflow: hidden;
white-space: nowrap;
padding-left: 8px;
font-size: $font-12px;
line-height: calc(2 * $font-12px);
color: $secondary-content;
}
.mx_ThreadInfo_avatar {
float: left;
}
.mx_ThreadInfo_thread-icon {

5
src/components/views/auth/PasswordLogin.tsx
View file

@ -317,6 +317,8 @@ export default class PasswordLogin extends React.PureComponent<IProps, IState> {
return <EmailField
className={classNames(classes)}
name="username" // make it a little easier for browser's remember-password
autoComplete="email"
type="email"
key="email_input"
placeholder="joe@example.com"
value={this.props.username}
@ -333,6 +335,7 @@ export default class PasswordLogin extends React.PureComponent<IProps, IState> {
return <Field
className={classNames(classes)}
name="username" // make it a little easier for browser's remember-password
autoComplete="username"
key="username_input"
type="text"
label={_t("Username")}
@ -359,6 +362,7 @@ export default class PasswordLogin extends React.PureComponent<IProps, IState> {
return <Field
className={classNames(classes)}
name="phoneNumber"
autoComplete="tel-national"
key="phone_input"
type="text"
label={_t("Phone")}
@ -444,6 +448,7 @@ export default class PasswordLogin extends React.PureComponent<IProps, IState> {
{ loginField }
<Field
className={pwFieldClass}
autoComplete="password"
type="password"
name="password"
label={_t('Password')}

2
src/components/views/rooms/EventTile.tsx
View file

@ -578,7 +578,7 @@ export default class EventTile extends React.Component<IProps, IState> {
}
return <>
<MemberAvatar member={lastEvent.sender} style={{ float: "left", width: "24px", height: "24px" }} />
<MemberAvatar member={lastEvent.sender} width={24} height={24} className="mx_ThreadInfo_avatar" />
<div className="mx_ThreadInfo_content">
<span className="mx_ThreadInfo_message-preview">
{ threadMessagePreview }