Fix MemberAvatar rendering and thread info color (#7085)

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

View file

@ -673,7 +673,7 @@ $left-gutter: 64px;
padding-right: 16px; padding-right: 16px;
padding-top: 8px; padding-top: 8px;
padding-bottom: 8px; padding-bottom: 8px;
font-size: 12px; font-size: $font-12px;
color: $secondary-content; color: $secondary-content;
box-sizing: border-box; box-sizing: border-box;
justify-content: flex-start; justify-content: flex-start;
@ -694,6 +694,13 @@ $left-gutter: 64px;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
padding-left: 8px; 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 { .mx_ThreadInfo_thread-icon {

View file

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

View file

@ -578,7 +578,7 @@ export default class EventTile extends React.Component<IProps, IState> {
} }
return <> 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"> <div className="mx_ThreadInfo_content">
<span className="mx_ThreadInfo_message-preview"> <span className="mx_ThreadInfo_message-preview">
{ threadMessagePreview } { threadMessagePreview }