Merge remote-tracking branch 'origin/develop' into develop

pull/4797/head
Weblate 2017-07-28 14:34:13 +00:00
commit 8b26d5b7fb
1 changed files with 7 additions and 0 deletions

View File

@ -128,6 +128,12 @@ limitations under the License.
color: $event-sending-color;
}
.mx_EventTile_sending .mx_UserPill,
.mx_EventTile_sending .mx_RoomPill,
.mx_EventTile_sending .mx_emojione {
opacity: 0.5;
}
.mx_EventTile_notSent {
color: $event-notsent-color;
}
@ -370,6 +376,7 @@ limitations under the License.
.mx_EventTile_content .markdown-body h6
{
font-family: inherit ! important;
color: inherit;
}