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

This commit is contained in:
Weblate 2018-02-15 14:51:12 +00:00
commit f33bddaadd
3 changed files with 11 additions and 1 deletions

View File

@ -54,7 +54,7 @@ limitations under the License.
left: 0px;
}
.mx_NotificationPanel .mx_EventTile .mx_SenderProfile,
.mx_NotificationPanel .mx_EventTile .mx_SenderProfile,
.mx_NotificationPanel .mx_EventTile .mx_MessageTimestamp {
color: $primary-fg-color;
font-size: 12px;

View File

@ -96,6 +96,11 @@ limitations under the License.
order: 2;
}
.mx_RoomView_body .mx_RoomView_messagePanelSpinner {
order: 2;
margin: auto;
}
.mx_RoomView_body .mx_RoomView_statusArea {
order: 3;
}

View File

@ -84,6 +84,11 @@ limitations under the License.
flex: 1 1 0;
}
.mx_RightPanel .mx_RoomView_messagePanelSpinner {
order: 2;
margin: auto;
}
.mx_RightPanel_footer {
order: 3;