PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

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
commit ec714283ca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
res/css/views/rooms/_RoomHeader.scss
View file

@ -19,7 +19,10 @@ limitations under the License.
border-bottom: 1px solid $primary-hairline-color; border-bottom: 1px solid $primary-hairline-color;
.mx_E2EIcon { .mx_E2EIcon {
margin: 0 5px; margin: 0;
position: absolute;
bottom: 0;
right: -5px;
} }
} }
@ -171,6 +174,7 @@ limitations under the License.
width: 28px; width: 28px;
height: 28px; height: 28px;
margin: 0 7px; margin: 0 7px;
position: relative;
} }
.mx_RoomHeader_avatar .mx_BaseAvatar_image { .mx_RoomHeader_avatar .mx_BaseAvatar_image {

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

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