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

Move room header shields over the avatar for the room
2020-01-21 16:56:09 +00:00 · 2020-01-21 16:56:09 +00:00 · ec714283ca
commit ec714283ca
parent 2d8f33e9ee c8a2f6a5a0
2 changed files with 6 additions and 3 deletions
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@ -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 }