Merge pull request #3653 from matrix-org/bwindels/fixe2eicons

Fix e2e icons
This commit is contained in:
Matthew Hodgson 2019-11-21 19:01:17 +00:00 committed by GitHub
commit e77cf2b87e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 32 deletions

View file

@ -15,8 +15,8 @@ limitations under the License.
*/
.mx_E2EIcon {
width: 25px;
height: 25px;
width: 16px;
height: 16px;
margin: 0 9px;
position: relative;
display: block;
@ -30,16 +30,14 @@ limitations under the License.
bottom: 0;
left: 0;
right: 0;
mask-repeat: no-repeat;
mask-size: contain;
background-repeat: no-repeat;
background-size: contain;
}
.mx_E2EIcon_verified::after {
mask-image: url('$(res)/img/e2e/verified.svg');
background-color: $accent-color;
background-image: url('$(res)/img/e2e/verified.svg');
}
.mx_E2EIcon_warning::after {
mask-image: url('$(res)/img/e2e/warning.svg');
background-color: $warning-color;
background-image: url('$(res)/img/e2e/warning.svg');
}

View file

@ -74,8 +74,6 @@ limitations under the License.
.mx_MessageComposer_e2eIcon.mx_E2EIcon {
position: absolute;
left: 60px;
width: 16px;
height: 16px;
margin-right: 0; // Counteract the E2EIcon class
margin-left: 3px; // Counteract the E2EIcon class
}

View file

@ -17,6 +17,10 @@ limitations under the License.
.mx_RoomHeader {
flex: 0 0 52px;
border-bottom: 1px solid $primary-hairline-color;
.mx_E2EIcon {
margin: 0 5px;
}
}
.mx_RoomHeader_wrapper {