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

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

Browse source 
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
commit 0549ef83db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
res/css/views/avatars/_DecoratedRoomAvatar.scss
View file

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

4
res/css/views/rooms/_RoomTile2.scss
View file

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

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

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