From a1ff00a7a8243c2c97ef357756c5c7405c7a1b58 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 13 Jul 2020 22:13:29 +0100
Subject: [PATCH] Fix scrollbar occlusion in the right panel

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/structures/_RightPanel.scss  | 5 +++++
 res/css/views/rooms/_MemberList.scss | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/res/css/structures/_RightPanel.scss b/res/css/structures/_RightPanel.scss
index 1e1d73d7c3..5be9f449be 100644
--- a/res/css/structures/_RightPanel.scss
+++ b/res/css/structures/_RightPanel.scss
@@ -25,6 +25,11 @@ limitations under the License.
     flex-direction: column;
     border-radius: 8px;
     margin: 5px;
+    padding: 4px 0;
+
+    .mx_RoomView_MessageList {
+        padding: 14px 18px; // top and bottom is 4px smaller to balance with the padding set above
+    }
 }
 
 .mx_RightPanel_header {
diff --git a/res/css/views/rooms/_MemberList.scss b/res/css/views/rooms/_MemberList.scss
index 99dc2338d4..98ed5025eb 100644
--- a/res/css/views/rooms/_MemberList.scss
+++ b/res/css/views/rooms/_MemberList.scss
@@ -26,6 +26,10 @@ limitations under the License.
         flex: 1 0 auto;
     }
 
+    .mx_SearchBox {
+        margin-bottom: 5px;
+    }
+
     h2 {
         text-transform: uppercase;
         color: $h3-color;
@@ -75,7 +79,7 @@ limitations under the License.
     background-color: $button-bg-color;
     border-radius: 4px;
     padding: 8px;
-    margin: 9px;
+    margin: 5px 9px 9px;
     display: flex;
     justify-content: center;
     color: $button-fg-color;