From 79701ed6dcc16ba8988532c8c7edaf5814d70592 Mon Sep 17 00:00:00 2001
From: Mauro Balades <mauro.balades@tutanota.com>
Date: Mon, 5 Aug 2024 12:25:39 +0200
Subject: [PATCH] chore: Update sidebar margin in Zen browser theme

---
 .../themes/shared/zen-browser-shared.css      | 30 +++++++++++++++++++
 src/browser/themes/shared/zen-sidebar.css     |  3 +-
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/browser/themes/shared/zen-browser-shared.css b/src/browser/themes/shared/zen-browser-shared.css
index 15a9d08dd..18d28ac91 100644
--- a/src/browser/themes/shared/zen-browser-shared.css
+++ b/src/browser/themes/shared/zen-browser-shared.css
@@ -538,6 +538,12 @@ panelmultiview {
   background: var(--zen-main-browser-background);
 }
 
+@media not (-moz-bool-pref: "zen.view.compact") {
+  #sidebar-box {
+    margin-top: 0 !important;
+  }
+}
+
 @media (-moz-bool-pref: "zen.view.compact") {
   :root[sizemode="fullscreen"],
   #navigator-toolbox[inFullscreen]{ margin-top: 0 !important; }
@@ -570,11 +576,31 @@ panelmultiview {
     }
   }
 
+  #zen-sidebar-web-panel-wrapper:not(:has(#zen-sidebar-web-panel[hidden="true"])),
+  #sidebar-box:not([positionend="true"]) {
+    margin-right: 0 !important;
+    margin-left: 10px !important;
+  }
+
+  #sidebar-box[positionend="true"] {
+    margin-left: 0 !important;
+    margin-right: 10px !important;
+  }
+
+  #sidebar-splitter {
+    margin: 0 !important;
+  }
+
   @media not (-moz-bool-pref: "zen.view.compact.hide-toolbar") {
     #navigator-toolbox {
       /* Remove the top margin */
       --zen-compact-toolbox-margin: calc(var(--zen-compact-toolbox-margin-single) / 3) var(--zen-compact-toolbox-margin-single) var(--zen-compact-toolbox-margin-single) var(--zen-compact-toolbox-margin-single);
     }
+
+    #zen-sidebar-web-panel-wrapper,
+    #sidebar-box {
+      margin-top: 0 !important;
+    }
   }
   
   #navigator-toolbox:hover,
@@ -646,6 +672,10 @@ panelmultiview {
     #titlebar {
       padding-top: 5px !important;
     }
+
+    #zen-sidebar-web-panel-wrapper {
+      margin-top: 10px !important;
+    }
   }
 }
 
diff --git a/src/browser/themes/shared/zen-sidebar.css b/src/browser/themes/shared/zen-sidebar.css
index bca14d698..f04c95bd9 100644
--- a/src/browser/themes/shared/zen-sidebar.css
+++ b/src/browser/themes/shared/zen-sidebar.css
@@ -14,7 +14,6 @@
   transition: .2s;
   margin-left: 0 !important;
   border: var(--zen-appcontent-border);
-  margin-top: 0 !important;
   box-shadow: none;
 }   
 
@@ -45,7 +44,7 @@
 }
 
 #sidebar-box[positionend] {
-  margin-left: 0 !important;
+  margin-left: 0;
 }
 
 .zen-sidebar-action-button {