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

This commit is contained in:
Weblate 2017-08-08 13:01:34 +00:00
commit f7c38992cc
2 changed files with 3 additions and 2 deletions

View File

@ -20,6 +20,7 @@ limitations under the License.
.mx_BaseAvatar_initial {
position: absolute;
left: 0px;
color: $avatar-initial-color;
text-align: center;
speak: none;

View File

@ -8,6 +8,7 @@
display: inline-block;
height: 20px;
line-height: 20px;
padding-left: 5px;
}
/* More specific to override `.markdown-body a` color */
@ -35,9 +36,8 @@
.mx_UserPill .mx_BaseAvatar,
.mx_RoomPill .mx_BaseAvatar {
position: relative;
left: -3px;
top: 2px;
margin-left: 2px;
margin-right: 2px;
}
.mx_Markdown_BOLD {