From 34d1433b5c687eb84274b21872ea63e7b1d9666f Mon Sep 17 00:00:00 2001
From: Harry Twyford <htwyford@mozilla.com>
Date: Fri, 30 Apr 2021 20:24:32 +0000
Subject: [PATCH] Bug 1707756 - Part 1 - Update Urlbar tips to Proton styles.
 r=mak,dao

Differential Revision: https://phabricator.services.mozilla.com/D113530
---
 browser/themes/shared/urlbarView.inc.css | 46 +++++++++---------------
 browser/themes/windows/browser.css       | 12 ++-----
 2 files changed, 20 insertions(+), 38 deletions(-)

diff --git a/browser/themes/shared/urlbarView.inc.css b/browser/themes/shared/urlbarView.inc.css
index 57dd4958e8f1..df2c47e619f9 100644
--- a/browser/themes/shared/urlbarView.inc.css
+++ b/browser/themes/shared/urlbarView.inc.css
@@ -19,14 +19,6 @@
 
   --urlbar-popup-action-color: hsl(178, 100%, 28%);
 
-  /* Colors copied from in-content button styling */
-  --urlbarView-button-background: rgba(12, 12, 13, 0.1);
-  --urlbarView-button-background-hover: rgba(12, 12, 13, 0.2);
-  --urlbarView-button-background-active: rgba(12, 12, 13, 0.3);
-  --urlbarView-primary-button-text: white;
-  --urlbarView-primary-button-background: #0060df;
-  --urlbarView-primary-button-background-hover: #003eaa;
-  --urlbarView-primary-button-background-active: #002275;
   --urlbarView-action-slide-in-distance: 200px;
 
   --urlbarView-item-inline-padding: calc(var(--urlbar-icon-padding) / 2 + 3px);
@@ -47,11 +39,6 @@
 :root[lwt-toolbar-field-focus-brighttext] {
   --urlbar-popup-url-color: var(--lwt-popup-brighttext-url-color);
   --urlbar-popup-action-color: #30e60b;
-
-  /* Colors copied from in-content button styling */
-  --urlbarView-button-background: rgba(249, 249, 250, 0.24);
-  --urlbarView-button-background-hover: rgba(249, 249, 250, 0.15);
-  --urlbarView-button-background-active: rgba(249, 249, 250, 0.2);
 }
 
 @media (-moz-proton) {
@@ -404,7 +391,7 @@
 
 /* Help button */
 
-/* Help buttons are a standard Photon ghost buttons. */
+/* Help buttons are ghost buttons. */
 .urlbarView-help {
   flex-grow: 0;
   flex-shrink: 0;
@@ -417,6 +404,7 @@
   padding-inline: 8px;
   margin-inline-start: 8px;
   margin-inline-end: 4px;
+  fill-opacity: 1;
   -moz-context-properties: fill, fill-opacity;
 }
 
@@ -427,15 +415,16 @@
 } /*** END proton ***/
 
 .urlbarView-help[selected] {
-  box-shadow: 0 0 0 1px #0a84ff inset, 0 0 0 1px #0a84ff, 0 0 0 4px rgba(10, 132, 255, 0.3);
+  outline: var(--focus-outline);
+  outline-offset: 2px;
 }
 
 .urlbarView-help:hover {
-  background-color: var(--urlbarView-button-background-hover);
+  background-color: var(--button-hover-bgcolor);
 }
 
 .urlbarView-help:hover:active {
-  background-color: var(--urlbarView-button-background-active);
+  background-color: var(--button-active-bgcolor);
 }
 
 /* Tip rows */
@@ -477,11 +466,10 @@
 .urlbarView-tip-button {
   min-height: 16px;
   padding: 7px;
-  border: 1px solid var(--urlbarView-button-border, var(--urlbarView-button-background));
-  border-radius: 2px;
+  border-radius: var(--toolbarbutton-border-radius);
   font-size: 0.93em;
-  color: var(--urlbarView-button-text, inherit);
-  background-color: var(--urlbarView-button-background);
+  background-color: var(--button-bgcolor);
+  font-weight: 600;
   background-clip: padding-box;
   min-width: 8.75em;
   text-align: center;
@@ -497,26 +485,26 @@
 } /*** END proton ***/
 
 .urlbarView-tip-button:hover {
-  background-color: var(--urlbarView-button-background-hover);
+  background-color: var(--button-hover-bgcolor);
 }
 
 .urlbarView-tip-button:hover:active {
-  background-color: var(--urlbarView-button-background-active);
+  background-color: var(--button-active-bgcolor);
 }
 
 .urlbarView-tip-button[selected] {
-  color: var(--urlbarView-primary-button-text);
-  background-color: var(--urlbarView-primary-button-background);
-  border-color: #0a84ff;
-  box-shadow: 0 0 0 1px #0a84ff, 0 0 0 4px rgba(10, 132, 255, 0.3);
+  color: var(--buttons-primary-button-color, white);
+  background-color: var(--buttons-primary-button-bgcolor, -moz-accent-color);
+  outline: var(--focus-outline);
+  outline-offset: 2px;
 }
 
 .urlbarView-tip-button[selected]:hover {
-  background-color: var(--urlbarView-primary-button-background-hover);
+  background-color: var(--buttons-primary-button-hover-bgcolor, color-mix(in srgb, black 10%, -moz-accent-color));
 }
 
 .urlbarView-tip-button[selected]:hover:active {
-  background-color: var(--urlbarView-primary-button-background-active);
+  background-color: var(--buttons-primary-button-active-bgcolor, color-mix(in srgb, black 20%, -moz-accent-color));
 }
 
 .urlbarView-tip-button-spacer {
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index fdaf5cac7af9..75e6479304d8 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -573,16 +573,10 @@ menuitem.bookmark-item {
 @media (-moz-windows-default-theme: 0) {
   :root:not(:-moz-lwtheme) {
     --urlbar-popup-action-color: -moz-nativehyperlinktext;
+  }
 
-    --urlbarView-button-text: buttontext;
-    --urlbarView-button-background: buttonface;
-    --urlbarView-button-background-hover: buttonface;
-    --urlbarView-button-background-active: buttonface;
-    --urlbarView-button-border: threedshadow;
-    --urlbarView-primary-button-text: highlighttext;
-    --urlbarView-primary-button-background: highlight;
-    --urlbarView-primary-button-background-hover: highlight;
-    --urlbarView-primary-button-background-active: highlight;
+  :root:not(:-moz-lwtheme) .urlbarView-tip-button[selected] {
+    color: var(--buttons-primary-button-color, highlighttext);
   }
 }