From c8c45c0077374b9322221b1c37e23b2ac1596511 Mon Sep 17 00:00:00 2001
From: Tim Nguyen <ntim.bugs@gmail.com>
Date: Tue, 21 Nov 2017 20:08:42 +0000
Subject: [PATCH] Bug 1297788 - Make urlbar autocomplete style match photon
 light/dark themes "Original patch by Kostas (rick3162@gmail.com)". r=jaws

MozReview-Commit-ID: IKnX5lLLj4L

--HG--
extra : amend_source : e95d4e5803f244bb87b93226ece0b86040dec8cd
---
 browser/themes/shared/compacttheme.inc.css    |  5 ++++
 .../themes/shared/urlbar-autocomplete.inc.css | 23 +++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/browser/themes/shared/compacttheme.inc.css b/browser/themes/shared/compacttheme.inc.css
index ecfd27d3d204..980f56c1890c 100644
--- a/browser/themes/shared/compacttheme.inc.css
+++ b/browser/themes/shared/compacttheme.inc.css
@@ -18,6 +18,11 @@
   --toolbarbutton-icon-fill-opacity: .7;
 
   --tab-line-color: #0a84ff;
+
+  --urlbar-popup-background: var(--url-and-searchbar-background-color);
+  --urlbar-popup-color: var(--chrome-color);
+  --urlbar-popup-highlight-background: var(--chrome-selection-background-color);
+  --urlbar-popup-highlight-color: var(--chrome-selection-color);
 }
 
 :root:-moz-lwtheme-brighttext {
diff --git a/browser/themes/shared/urlbar-autocomplete.inc.css b/browser/themes/shared/urlbar-autocomplete.inc.css
index 7c4083bd3d6a..6a09d9e5847e 100644
--- a/browser/themes/shared/urlbar-autocomplete.inc.css
+++ b/browser/themes/shared/urlbar-autocomplete.inc.css
@@ -4,12 +4,26 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 %endif
 
+:root {
+  --urlbar-popup-background: -moz-field;
+  --urlbar-popup-color: -moz-fieldtext;
+  --urlbar-popup-highlight-background: Highlight;
+  --urlbar-popup-highlight-color: HighlightText;
+}
+
 #treecolAutoCompleteImage {
   max-width: 36px;
 }
 
+#PopupAutoCompleteRichResult {
+  background: var(--urlbar-popup-background);
+  color: var(--urlbar-popup-color);
+}
+
 #PopupAutoCompleteRichResult .autocomplete-richlistbox {
   padding: 4px 3px;
+  background: transparent;
+  color: inherit;
 }
 
 #PopupAutoCompleteRichResult .autocomplete-richlistitem {
@@ -24,6 +38,15 @@
   border-inline-end: var(--item-padding-end) solid transparent;
 }
 
+#PopupAutoCompleteRichResult .autocomplete-richlistitem[selected] {
+  background: var(--urlbar-popup-highlight-background);
+  color: var(--urlbar-popup-highlight-color);
+}
+
 :root[uidensity=touch] #PopupAutoCompleteRichResult .autocomplete-richlistitem {
   min-height: 40px;
 }
+
+#PopupAutoCompleteRichResult .search-panel-input-value {
+  color: var(--urlbar-popup-color);
+}