Merge pull request element-hq#6131 from vector-im/luke/fix-scrollbars-on-jump-to-first

lukebarnard1 · web-flow · commit 332640c4ba55 · 2018-02-15T14:51:06.000Z
Adjust CSS to prevent scrollbars on message panel spinner
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_NotificationPanel.scss b/src/skins/vector/css/matrix-react-sdk/structures/_NotificationPanel.scss
@@ -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;
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss b/src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss
@@ -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;
 }
diff --git a/src/skins/vector/css/vector-web/structures/_RightPanel.scss b/src/skins/vector/css/vector-web/structures/_RightPanel.scss
@@ -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;
 

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ limitations under the License.`
`54`	`54`	`left: 0px;`
`55`	`55`	`}`
`56`	`56`
`57`		`-.mx_NotificationPanel .mx_EventTile .mx_SenderProfile,`
	`57`	`+.mx_NotificationPanel .mx_EventTile .mx_SenderProfile,`
`58`	`58`	`.mx_NotificationPanel .mx_EventTile .mx_MessageTimestamp {`
`59`	`59`	`color: $primary-fg-color;`
`60`	`60`	`font-size: 12px;`
Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,11 @@ limitations under the License.`
`96`	`96`	`order: 2;`
`97`	`97`	`}`
`98`	`98`
	`99`	`+.mx_RoomView_body .mx_RoomView_messagePanelSpinner {`
	`100`	`+ order: 2;`
	`101`	`+ margin: auto;`
	`102`	`+}`
	`103`	`+`
`99`	`104`	`.mx_RoomView_body .mx_RoomView_statusArea {`
`100`	`105`	`order: 3;`
`101`	`106`	`}`