matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-17 17:42:41 +03:00
Code Activity

Merge pull request #3888 from matrix-org/zip/11833-overlay-shields

Browse Source 
Move room header shields over the avatar for the room
This commit is contained in:
Zoe
2020-01-21 16:56:09 +00:00
committed by GitHub
parent 2d8f33e9ee c8a2f6a5a0
commit ec714283ca
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/views/rooms/RoomHeader.js
View File

@@ -310,8 +310,7 @@ export default createReactClass({
return (
<div className="mx_RoomHeader light-panel">
<div className="mx_RoomHeader_wrapper">
<div className="mx_RoomHeader_avatar">{ roomAvatar }</div>
{ e2eIcon }
<div className="mx_RoomHeader_avatar">{ roomAvatar }{ e2eIcon }</div>
{ privateIcon }
{ name }
{ topicElement }