1
0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-16 06:42:26 +03:00

Merge pull request #4878 from matrix-org/travis/room-list/fix-community-invites

Fix alignment of avatars on community invites
This commit is contained in:
Travis Ralston
2020-07-02 14:39:25 -06:00
committed by GitHub
3 changed files with 5 additions and 4 deletions

View File

@@ -14,7 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
.mx_DecoratedRoomAvatar {
// XXX: We shouldn't be using TemporaryTile anywhere - delete it.
.mx_DecoratedRoomAvatar, .mx_TemporaryTile {
position: relative;
.mx_RoomTileIcon {

View File

@@ -29,7 +29,7 @@ limitations under the License.
border-radius: 32px;
}
.mx_DecoratedRoomAvatar {
.mx_DecoratedRoomAvatar, .mx_RoomTile2_avatarContainer {
margin-right: 8px;
}
@@ -152,7 +152,7 @@ limitations under the License.
align-items: center;
position: relative;
.mx_DecoratedRoomAvatar {
.mx_DecoratedRoomAvatar, .mx_RoomTile2_avatarContainer {
margin-right: 0;
}
}

View File

@@ -56,6 +56,7 @@ export default class TemporaryTile extends React.Component<IProps, IState> {
// XXX: We copy classes because it's easier
const classes = classNames({
'mx_RoomTile2': true,
'mx_TemporaryTile': true,
'mx_RoomTile2_selected': this.props.isSelected,
'mx_RoomTile2_minimized': this.props.isMinimized,
});
@@ -85,7 +86,6 @@ export default class TemporaryTile extends React.Component<IProps, IState> {
);
if (this.props.isMinimized) nameContainer = null;
const avatarSize = 32;
return (
<React.Fragment>
<RovingTabIndexWrapper>