From 8ea551fb6de2ee89310c4b21f3fe487835c468d4 Mon Sep 17 00:00:00 2001
From: Andy Balaam <andyb@element.io>
Date: Wed, 10 Nov 2021 11:24:27 +0000
Subject: [PATCH] Do not shift buttons in high contrast theme (#7102)

---
 .../css/_light-high-contrast.scss             | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/res/themes/light-high-contrast/css/_light-high-contrast.scss b/res/themes/light-high-contrast/css/_light-high-contrast.scss
index 9643e5ded3..c423f99438 100644
--- a/res/themes/light-high-contrast/css/_light-high-contrast.scss
+++ b/res/themes/light-high-contrast/css/_light-high-contrast.scss
@@ -57,15 +57,28 @@ $roomtopic-color: $secondary-content;
     text-decoration: none;
 }
 
-.mx_AccessibleButton {
-    margin-left: 4px;
-}
-
+// Draw an outline on buttons with focus
 .mx_AccessibleButton:focus {
     outline: 2px solid $accent-color;
     outline-offset: 2px;
 }
 
+// Add padding (and remove margin to compensate), so the outline is not
+// chopped off on the left
+.mx_TabbedView_tabPanel {
+    margin-left: 236px !important;  // Remove 4 to allow 4 in mx_SettingsTab
+}
+.mx_SettingsTab {
+    padding-left: 4px !important;
+}
+.mx_BaseCard {
+    padding-left: 4px !important;  // Remove 4 to allow 4 in mx_BaseCard_Group
+}
+.mx_BaseCard_Group {
+    padding-left: 4px !important;
+}
+
+
 .mx_BasicMessageComposer .mx_BasicMessageComposer_inputEmpty > :first-child::before {
     color: $secondary-content;
     opacity: 1 !important;