From 18e3d8706a5c4a21c6709c6d0d21722ad0c5a892 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Fri, 13 Oct 2023 11:50:57 +0000
Subject: [PATCH] Bug 1858726 - Have a single source of truth for
 toolbar-field-border colors. r=dao,desktop-theme-reviewers

I missed the urlbar-searchbar bits on the regressing bug.

Differential Revision: https://phabricator.services.mozilla.com/D190916
---
 browser/themes/shared/urlbar-searchbar.css | 8 --------
 toolkit/themes/shared/global-shared.css    | 2 ++
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/browser/themes/shared/urlbar-searchbar.css b/browser/themes/shared/urlbar-searchbar.css
index 0343b1806d69..37999aeaa501 100644
--- a/browser/themes/shared/urlbar-searchbar.css
+++ b/browser/themes/shared/urlbar-searchbar.css
@@ -5,17 +5,9 @@
 @namespace html url("http://www.w3.org/1999/xhtml");
 
 :root {
-  --toolbar-field-border-color: transparent;
-  --toolbar-field-focus-border-color: color-mix(in srgb, var(--focus-outline-color) 50%, transparent);
   --urlbar-container-padding: 1px;
   --urlbar-margin-inline: 5px;
   --urlbar-search-button-width: calc(16px + 2 * var(--urlbar-icon-padding));
-
-  @media (prefers-contrast) {
-    /* TODO: Should probably be a system color instead (ThreeDShadow?) */
-    --toolbar-field-border-color: light-dark(hsla(240, 5%, 5%, .25), hsla(240, 95%, 95%, .35));
-    --toolbar-field-focus-border-color: var(--focus-outline-color);
-  }
 }
 
 /* When rich suggestions are enabled the urlbar identity icon is given extra padding to
diff --git a/toolkit/themes/shared/global-shared.css b/toolkit/themes/shared/global-shared.css
index 3db6d138cf72..982ca8ecfb44 100644
--- a/toolkit/themes/shared/global-shared.css
+++ b/toolkit/themes/shared/global-shared.css
@@ -41,6 +41,7 @@
   --toolbar-field-border-color: ThreeDShadow;
   --toolbar-field-focus-background-color: Field;
   --toolbar-field-focus-color: FieldText;
+  --toolbar-field-focus-border-color: color-mix(in srgb, var(--focus-outline-color) 50%, transparent);
 }
 
 :root:-moz-lwtheme {
@@ -58,6 +59,7 @@
     --toolbarbutton-disabled-opacity: 0.3;
 
     --panel-separator-color: currentColor;
+    --toolbar-field-focus-border-color: var(--focus-outline-color);
   }
 
   :root:not(:-moz-lwtheme) {