Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-10-01 01:26:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/skins/vector/css/matrix-react-sdk/structures/_NotificationPanel.scss
View File

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

5
src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss
View File

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

5
src/skins/vector/css/vector-web/structures/_RightPanel.scss
View File

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