Bug 1589543 - Let :hover not override [focused] styling. r=mak

Differential Revision: https://phabricator.services.mozilla.com/D49823

--HG--
extra : moz-landing-system : lando

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

@@ -65,13 +65,19 @@
   padding: 0;
 }
 
-#urlbar:not(.megabar):hover:not([open]),
-#urlbar.megabar:hover:not([breakout-extend]) > #urlbar-background,
-#searchbar:hover {
+#urlbar:not(.megabar):not([focused="true"]):hover,
+#urlbar.megabar:not([focused="true"]):hover > #urlbar-background,
+#searchbar:not(:focus-within):hover {
   border-color: @fieldHoverBorderColor@;
   box-shadow: 0 1px 6px rgba(0,0,0,.1);
 }
 
+#urlbar:not(.megabar)[focused="true"],
+#urlbar.megabar[focused="true"] > #urlbar-background,
+#searchbar:focus-within {
+  border-color: var(--toolbar-field-focus-border-color);
+}
+
 #urlbar:-moz-lwtheme,
 #navigator-toolbox #searchbar:-moz-lwtheme {
   color: var(--lwt-toolbar-field-color, black);
@@ -101,12 +107,6 @@
   background-color: var(--lwt-toolbar-field-background-color, white);
 }
 
-#urlbar:not(.megabar)[focused="true"],
-#urlbar.megabar[focused="true"] > #urlbar-background,
-#searchbar:focus-within {
-  border-color: var(--toolbar-field-focus-border-color);
-}
-
 #urlbar[focused="true"]:-moz-lwtheme,
 #navigator-toolbox #searchbar:focus-within:-moz-lwtheme {
   color: var(--lwt-toolbar-field-focus-color, var(--lwt-toolbar-field-color, black));