Backed out changeset 25186df80cfa (bug 1698834) for browser_preferences_usage.js mochitest failures CLOSED TREE

browser/themes/osx/browser.css

@@ -236,14 +236,6 @@
 
 %include ../shared/urlbar-searchbar.inc.css
 
-@media not (prefers-contrast) {
-  @supports -moz-bool-pref("browser.proton.urlbar.enabled") {
-  :root:not(:-moz-lwtheme) #urlbar:not([focused="true"]) {
-    --urlbar-box-bgcolor: white;
-  }
-  } /*** END proton ***/
-}
-
 #urlbar,
 #searchbar {
   font-size: 1.25em;

browser/themes/shared/browser-custom-colors.inc.css

@@ -47,6 +47,7 @@
     --autocomplete-popup-highlight-background: var(--arrowpanel-dimmed);
     --autocomplete-popup-highlight-color: rgb(21,20,26);
     --urlbar-result-hover-bgcolor: rgb(240,240,244);
+    --urlbar-box-unfocused-bgcolor: white;
   }
   } /** END Proton **/
 }

browser/themes/shared/browser.inc.css

@@ -39,8 +39,7 @@
   --identity-box-margin-inline: 4px;
   --identity-box-label-opacity: .8;
   --urlbar-box-bgcolor: var(--buttons-secondary-bgcolor);
-  --urlbar-box-hover-bgcolor: color-mix(in srgb, var(--urlbar-box-bgcolor), currentColor 12%);
-  --urlbar-box-active-bgcolor: color-mix(in srgb, var(--urlbar-box-bgcolor), currentColor 21%);
+  --urlbar-box-unfocused-bgcolor: var(--buttons-secondary-bgcolor);
 
   --urlbar-min-height: 32px;
   --urlbar-icon-padding: 6px; /* (32px - 2px border - 2px padding - 16px icon) / 2 */

browser/themes/shared/compacttheme.inc.css

@@ -12,7 +12,7 @@
 }
 
 @supports -moz-bool-pref("browser.proton.urlbar.enabled") {
-#urlbar:not([focused="true"]) {
-  --urlbar-box-bgcolor: var(--lwt-toolbar-field-focus);
+:root {
+  --urlbar-box-unfocused-bgcolor: var(--lwt-toolbar-field-focus);
 }
 } /** END Proton **/

browser/themes/shared/identity-block/identity-block.inc.css

@@ -129,19 +129,11 @@
   background-color: var(--urlbar-box-bgcolor);
 }
 
-#identity-box[pageproxystate="valid"].notSecureText > .identity-box-button:hover:not([open]),
-#identity-box[pageproxystate="valid"].chromeUI > .identity-box-button:hover:not([open]),
-#identity-box[pageproxystate="valid"].extensionPage > .identity-box-button:hover:not([open]) {
-  background-color: var(--urlbar-box-hover-bgcolor);
-}
-
-#identity-box[pageproxystate="valid"].notSecureText > .identity-box-button:hover:active,
-#identity-box[pageproxystate="valid"].notSecureText > .identity-box-button[open=true],
-#identity-box[pageproxystate="valid"].chromeUI > .identity-box-button:hover:active,
-#identity-box[pageproxystate="valid"].chromeUI > .identity-box-button[open=true],
-#identity-box[pageproxystate="valid"].extensionPage > .identity-box-button:hover:active,
-#identity-box[pageproxystate="valid"].extensionPage > .identity-box-button[open=true] {
-  background-color: var(--urlbar-box-active-bgcolor);
+#urlbar:not([focused="true"]) #identity-box[pageproxystate="valid"].notSecureText > .identity-box-button,
+#urlbar:not([focused="true"]) #identity-box[pageproxystate="valid"].chromeUI > .identity-box-button,
+#urlbar:not([focused="true"]) #identity-box[pageproxystate="valid"].extensionPage > .identity-box-button,
+#urlbar:not([focused="true"]) #urlbar-label-box {
+  background-color: var(--urlbar-box-unfocused-bgcolor);
 }
 } /*** END proton ***/
 

browser/themes/shared/urlbar-searchbar.inc.css

@@ -595,6 +595,7 @@
   border-image: linear-gradient(transparent 15%, var(--urlbar-separator-color) 15%, var(--urlbar-separator-color) 85%, transparent 85%);
   border-image-slice: 1;
   width: 1px;
+  height: calc(var(--urlbar-min-height) - 2px);
   visibility: hidden;
 }
 
@@ -834,8 +835,6 @@
   transition-property: background-color, mask-position-x, width, margin-inline-end;
   transition-timing-function: ease-in-out, ease-in-out, step-end, step-end;
   transition-duration: var(--cfr-animation-duration);
-  -moz-box-align: center;
-  margin-block: calc((var(--urlbar-min-height) - var(--urlbar-container-padding) - 2px /* border */ - 24px) / 2);
 }
 #cfr-label-container:-moz-locale-dir(rtl) {
   mask-position-x: calc(var(--cfr-label-width) * -1);
@@ -904,17 +903,8 @@
   font-size: .8em;
   padding: 0 8px;
   border-radius: 1em;
-  background-color: var(--urlbar-box-bgcolor);
-  margin-block: calc((var(--urlbar-min-height) - var(--urlbar-container-padding) - 2px /* border */ - 18px) / 2);
-  overflow: hidden;
-}
-
-#urlbar-zoom-button:hover {
-  background-color: var(--urlbar-box-hover-bgcolor);
-}
-
-#urlbar-zoom-button:hover:active {
-  background-color: var(--urlbar-box-active-bgcolor);
+  background-color: hsla(0,0%,0%,.05);
+  border: 1px solid hsla(210,4%,50%,.3);
 }
 
 @keyframes urlbar-zoom-reset-pulse {
@@ -934,20 +924,21 @@
   animation-duration: 250ms;
 }
 
-@supports not -moz-bool-pref("browser.proton.urlbar.enabled") {
-#urlbar-zoom-button {
-  background-color: hsla(0,0%,0%,.05);
-  border: 1px solid hsla(210,4%,50%,.3);
-}
-
 #urlbar-zoom-button:hover {
-  background-color: color-mix(in srgb, currentColor 10%, transparent);
+  background-color: hsla(0,0%,0%,.1);
 }
 
 #urlbar-zoom-button:hover:active {
-  background-color: color-mix(in srgb, currentColor 17%, transparent);
+  background-color: hsla(0,0%,0%,.15);
+}
+
+:root[lwt-toolbar-field-brighttext] #urlbar-zoom-button:hover {
+  background-color: rgba(255,255,255,.2);
+}
+
+:root[lwt-toolbar-field-brighttext] #urlbar-zoom-button:hover:active {
+  background-color: rgba(255,255,255,.3);
 }
-} /*** END !proton ***/
 
 #urlbar-zoom-button:-moz-focusring {
   outline: var(--toolbarbutton-focus-outline);

browser/themes/windows/browser.css

@@ -531,14 +531,6 @@ menuitem.bookmark-item {
 
 %include ../shared/urlbar-searchbar.inc.css
 
-@media not (prefers-contrast) {
-  @supports -moz-bool-pref("browser.proton.urlbar.enabled") {
-  :root:not(:-moz-lwtheme) #urlbar:not([focused="true"]) {
-    --urlbar-box-bgcolor: white;
-  }
-  } /*** END proton ***/
-}
-
 #urlbar,
 #searchbar {
   font-size: 1.15em;