From b6b663ec2ff669e02b9f0620309817ee7d94fbf8 Mon Sep 17 00:00:00 2001
From: mauro-balades <mauro.balades@tutanota.com>
Date: Sat, 30 Mar 2024 16:29:52 +0100
Subject: [PATCH] Fixed shadow displaying when #urlbar:focus-within is active

---
 .../themes/addons/alpenglow/manifest-json.patch   |  4 ++--
 src/browser/themes/shared/sidebar-css.patch       |  6 +++---
 src/browser/themes/shared/zen-browser-shared.css  | 15 ++++++++++++++-
 src/toolkit/content/zen-xul.css                   |  6 +++---
 4 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/browser/themes/addons/alpenglow/manifest-json.patch b/src/browser/themes/addons/alpenglow/manifest-json.patch
index edc620a6e..6a54b796b 100644
--- a/src/browser/themes/addons/alpenglow/manifest-json.patch
+++ b/src/browser/themes/addons/alpenglow/manifest-json.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/themes/addons/alpenglow/manifest.json b/browser/themes/addons/alpenglow/manifest.json
-index 05a25e13915edee3ba51ed1c1b5569faa70cd536..fc9c56843a38fcfbebaf2508a66d0c3b97dfb2f2 100644
+index 05a25e13915edee3ba51ed1c1b5569faa70cd536..58c3a124156748ec07e828a7a3a969e523383e1d 100644
 --- a/browser/themes/addons/alpenglow/manifest.json
 +++ b/browser/themes/addons/alpenglow/manifest.json
 @@ -3,137 +3,99 @@
@@ -177,7 +177,7 @@ index 05a25e13915edee3ba51ed1c1b5569faa70cd536..fc9c56843a38fcfbebaf2508a66d0c3b
 +      "toolbar_field_icon_opacity": "0.72",
 +      "input_border_color": "rgba(0, 0, 0, .3)",
 +      "zap_gradient": "linear-gradient(90deg, #9059FF 0%, #FF4AA2 52.08%, #FFBD4F 100%)",
-+      "zen_main_browser_background": "linear-gradient(135deg, rgb(254, 181, 188) 0%, rgb(115, 99, 207) 100%)"
++      "zen_main_browser_background": "linear-gradient(135deg, rgb(254, 181, 188) 0%, rgb(149, 134, 232) 100%)"
      }
    },
  
diff --git a/src/browser/themes/shared/sidebar-css.patch b/src/browser/themes/shared/sidebar-css.patch
index 37a20d420..d1d9eb75c 100644
--- a/src/browser/themes/shared/sidebar-css.patch
+++ b/src/browser/themes/shared/sidebar-css.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/themes/shared/sidebar.css b/browser/themes/shared/sidebar.css
-index a9b3886e1ff4a36c5bd161985719f66a41d95458..b9b9244b01dce07bd1419e0d8d3cdf16757ede82 100644
+index a9b3886e1ff4a36c5bd161985719f66a41d95458..b181112f3db8deb7b71767674e0beac625f6ef66 100644
 --- a/browser/themes/shared/sidebar.css
 +++ b/browser/themes/shared/sidebar.css
 @@ -137,3 +137,27 @@ menuseparator + #sidebar-extensions-separator {
@@ -16,7 +16,7 @@ index a9b3886e1ff4a36c5bd161985719f66a41d95458..b9b9244b01dce07bd1419e0d8d3cdf16
 +}
 +
 +#sidebar-box {
-+  margin: 0 0 10px 10px;
++  margin: 0 0 var(--zen-appcontent-separator-from-window) var(--zen-appcontent-separator-from-window);
 +  border-radius: var(--zen-panel-radius);
 +}
 +
@@ -28,5 +28,5 @@ index a9b3886e1ff4a36c5bd161985719f66a41d95458..b9b9244b01dce07bd1419e0d8d3cdf16
 +}
 +
 +#sidebar-box[positionend] {
-+  margin: 0 10px 10px 0;
++  margin: 0 var(--zen-appcontent-separator-from-window) var(--zen-appcontent-separator-from-window) 0;
 +}
diff --git a/src/browser/themes/shared/zen-browser-shared.css b/src/browser/themes/shared/zen-browser-shared.css
index fd7bc1362..d7a82914f 100644
--- a/src/browser/themes/shared/zen-browser-shared.css
+++ b/src/browser/themes/shared/zen-browser-shared.css
@@ -1,6 +1,6 @@
 
 #navigator-toolbox toolbar#TabsToolbar {
-  margin: 5px 0.5%;
+  margin: 10px var(--zen-appcontent-separator-from-window);
 }
 
 #PersonalToolbar {
@@ -20,3 +20,16 @@
   height: 1px;
   width: 100%;
 }
+
+#urlbar[focused="true"] > #urlbar-background,
+#searchbar:focus-within {
+  box-shadow: none !important;
+}
+
+#urlbar[focused="true"]:not([suppress-focus-border]) > #urlbar-background,
+#searchbar:focus-within {
+  outline: none !important;
+  outline-offset: none !important;
+  outline-color: none !important;
+  border-color: var(--zen-appcontent-separator-from-window);
+}
diff --git a/src/toolkit/content/zen-xul.css b/src/toolkit/content/zen-xul.css
index f65875dea..29a8adc8b 100644
--- a/src/toolkit/content/zen-xul.css
+++ b/src/toolkit/content/zen-xul.css
@@ -1,6 +1,7 @@
 
 :root {
-  --zen-main-browser-background: linear-gradient(135deg, rgb(254, 181, 188) 0%, rgb(115, 99, 207) 100%); 
+  --zen-main-browser-background: light-dark(#ddd, #4a4a4a); 
+  --zen-appcontent-separator-from-window: 20px;
 }
 
 html#main-window > body > toolbox#navigator-toolbox, 
@@ -16,8 +17,7 @@ html#main-window > body {
   border-radius: var(--zen-panel-radius);
   overflow: hidden;
   box-shadow: 0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1);
-  margin: 10px;
-
+  margin: var(--zen-appcontent-separator-from-window);
   margin-top: 0;
 }