From 3beb604136d280a6dde1811e894ec1eded84db2a Mon Sep 17 00:00:00 2001
From: Mauro Balades <mauro.balades@tutanota.com>
Date: Thu, 4 Jul 2024 18:56:13 +0200
Subject: [PATCH] Update margin-bottom in welcome.css and dragBall position in
 welcome.js

---
 src/browser/components/zen-welcome/welcome.css        |  2 +-
 src/browser/components/zen-welcome/welcome.js         |  2 +-
 src/browser/themes/shared/urlbar-searchbar-css.patch  | 11 ++++++++++-
 src/browser/themes/shared/zen-browser-shared.css      |  7 ++++---
 src/toolkit/content/zen-xul.css                       |  6 +++---
 .../in-content/zen-common-shared-ui-override.css      |  4 +++-
 6 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/browser/components/zen-welcome/welcome.css b/src/browser/components/zen-welcome/welcome.css
index cf65997fe..d232a567f 100644
--- a/src/browser/components/zen-welcome/welcome.css
+++ b/src/browser/components/zen-welcome/welcome.css
@@ -135,7 +135,7 @@ input[type='checkbox'] {
 }
 
 #search h1 {
-  margin-bottom: 50px;
+  margin-bottom: 25px;
 }
 
 #theme h1 {
diff --git a/src/browser/components/zen-welcome/welcome.js b/src/browser/components/zen-welcome/welcome.js
index 6e3df17eb..2c468614d 100644
--- a/src/browser/components/zen-welcome/welcome.js
+++ b/src/browser/components/zen-welcome/welcome.js
@@ -180,7 +180,7 @@ class Themes extends Page {
     ctx.fillRect(0, 0, 1000, 150);
 
     const dragBall = document.getElementById('dragBall');
-    dragBall.style.left = `0px`;
+    dragBall.style.left = `17px`;
     dragBall.addEventListener('mousedown', (e) => {
       const rect = colorList.getBoundingClientRect();
       e.preventDefault();
diff --git a/src/browser/themes/shared/urlbar-searchbar-css.patch b/src/browser/themes/shared/urlbar-searchbar-css.patch
index 105a2e8af..bb54c9eb0 100644
--- a/src/browser/themes/shared/urlbar-searchbar-css.patch
+++ b/src/browser/themes/shared/urlbar-searchbar-css.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/themes/shared/urlbar-searchbar.css b/browser/themes/shared/urlbar-searchbar.css
-index 9fc88fbde80a39989bde559ecc07b8e3094ccb7e..170d9f31e1c0ac0c1ba3cea828d4a530e61e079b 100644
+index b5684c5f6f4b932070ef2bc53750504791f7f3c3..c3ffdb99adbb4a331967b93181d536dad1a41488 100644
 --- a/browser/themes/shared/urlbar-searchbar.css
 +++ b/browser/themes/shared/urlbar-searchbar.css
 @@ -59,7 +59,7 @@
@@ -11,3 +11,12 @@ index 9fc88fbde80a39989bde559ecc07b8e3094ccb7e..170d9f31e1c0ac0c1ba3cea828d4a530
    background-clip: border-box;
    border: 1px solid var(--toolbar-field-border-color);
    border-radius: var(--toolbarbutton-border-radius);
+@@ -92,7 +92,7 @@
+      --toolbar-field-focus-border-color is set equal to --focus-outline-color
+      on :root, but LWT themes can override this value. */
+   outline-color: var(--toolbar-field-focus-border-color);
+-  border-color: transparent;
++  /*border-color: transparent;*/
+ }
+ 
+ #urlbar[focused="true"] > #urlbar-background,
diff --git a/src/browser/themes/shared/zen-browser-shared.css b/src/browser/themes/shared/zen-browser-shared.css
index 3edabb290..324a59a62 100644
--- a/src/browser/themes/shared/zen-browser-shared.css
+++ b/src/browser/themes/shared/zen-browser-shared.css
@@ -57,7 +57,10 @@
   overflow: visible;
 }
 
-#urlbar[focused="true"] > #urlbar-background,
+#urlbar {
+  border: 1px solid light-dark(rgba(0,0,0,.2), rgba(255,255,255,.2))
+}
+
 #searchbar:focus-within {
   border-color: transparent !important;
 }
@@ -67,9 +70,7 @@
 }
 
 #urlbar[focused="true"] > #urlbar-background {
-  border-radius: 10px !important;
   background: var(--zen-dialog-background) !important;
-  border: 1px solid transparent;
 }
 
 #urlbar[focused="true"]:not([suppress-focus-border]) > #urlbar-background,
diff --git a/src/toolkit/content/zen-xul.css b/src/toolkit/content/zen-xul.css
index aefc4adf2..cba001f2a 100644
--- a/src/toolkit/content/zen-xul.css
+++ b/src/toolkit/content/zen-xul.css
@@ -47,11 +47,11 @@ panel[type="arrow"][animate][animate="open"] {
 
 @keyframes zen-jello-animation {
   0% {
-    transform: scale3d(0.9, 0.9, 0.9);
+    transform: scale3d(0.8, 0.8, 0.8);
   }
 
-  50% {
-    transform: scale3d(1.01, 1.01, 1.01);
+  60% {
+    transform: scale3d(1.02, 1.02, 1.02);
   }
 
   to {
diff --git a/src/toolkit/themes/shared/in-content/zen-common-shared-ui-override.css b/src/toolkit/themes/shared/in-content/zen-common-shared-ui-override.css
index 4f35ac864..d6fc1ce18 100644
--- a/src/toolkit/themes/shared/in-content/zen-common-shared-ui-override.css
+++ b/src/toolkit/themes/shared/in-content/zen-common-shared-ui-override.css
@@ -18,7 +18,9 @@ button:active {
 }
 
 html|button:not(:is(
-  .tab-button, .ghost-button
+  .tab-button, .ghost-button,
+  .button-toggle, .button-edit,
+  .button-add
 )) {
   transition: .2s;
   border-radius: 6px !important;