From 85c0b8dea320b7ce2bdc3d1ec42df862ff019a0f Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 13 Feb 2018 14:15:22 +0000
Subject: [PATCH 1/3] Adjust CSS to prevent scrollbars on message panel spinner

when clicking on permalinks/jump to first
---
 .../vector/css/matrix-react-sdk/structures/_RoomView.scss  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss b/src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss
index 7944d01dc..9ca3ad529 100644
--- 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;
 }
@@ -113,8 +118,6 @@ limitations under the License.
     max-width: 960px;
     margin: auto;
 
-    min-height: 100%;
-
     display: flex;
 
     flex-direction: column;

From 7ac350ea36c92d4a9f796e72f94e2b4e6437b38d Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 14 Feb 2018 11:17:21 +0000
Subject: [PATCH 2/3] Give mx_RoomView_messageListWrapper its `min-height:
 100%` back

because the spinner now exists separately to it
(as mx_RoomView_messagePanelSpinner) so their CSS is disentangled.
---
 src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss b/src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss
index 9ca3ad529..b8e119037 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss
+++ b/src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss
@@ -118,6 +118,8 @@ limitations under the License.
     max-width: 960px;
     margin: auto;
 
+    min-height: 100%;
+
     display: flex;
 
     flex-direction: column;

From 5c354dda230acdb6bb874bd33d71f6efac87124d Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 15 Feb 2018 14:34:44 +0000
Subject: [PATCH 3/3] Fix messagePanelSpinner flex order in RightPanel

---
 .../css/matrix-react-sdk/structures/_NotificationPanel.scss  | 2 +-
 src/skins/vector/css/vector-web/structures/_RightPanel.scss  | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_NotificationPanel.scss b/src/skins/vector/css/matrix-react-sdk/structures/_NotificationPanel.scss
index ef75678dc..a899808d5 100644
--- 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/vector-web/structures/_RightPanel.scss b/src/skins/vector/css/vector-web/structures/_RightPanel.scss
index 85057410c..b4dff612e 100644
--- 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;