Bug 1589543 - Let :hover not override [focused] styling. r=mak
authorDão Gottwald <dao@mozilla.com>
Sat, 19 Oct 2019 17:28:08 +0000
changeset 498283 014c61389f0bd8982f45be269a761fb0d027a6d2
parent 498282 530ff0c5938780c0e3a0e62a9d1d5716f2e61f7a
child 498284 11d13005c8767500d6a20858e9db82603e8fb808
child 498285 ed4954f05de48a2516dce64a7d0d0a3fcf3b6f9a
push id36710
push userdvarga@mozilla.com
push dateSat, 19 Oct 2019 21:40:34 +0000
treeherdermozilla-central@014c61389f0b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmak
bugs1589543
milestone71.0a1
first release with
nightly linux32
014c61389f0b / 71.0a1 / 20191019214034 / files
nightly linux64
014c61389f0b / 71.0a1 / 20191019214034 / files
nightly mac
014c61389f0b / 71.0a1 / 20191019214034 / files
nightly win32
014c61389f0b / 71.0a1 / 20191019214034 / files
nightly win64
014c61389f0b / 71.0a1 / 20191019214034 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1589543 - Let :hover not override [focused] styling. r=mak Differential Revision: https://phabricator.services.mozilla.com/D49823
browser/themes/shared/urlbar-searchbar.inc.css
--- a/browser/themes/shared/urlbar-searchbar.inc.css
+++ b/browser/themes/shared/urlbar-searchbar.inc.css
@@ -60,23 +60,29 @@
   -moz-box-flex: 1;
   background-color: transparent;
   color: inherit;
   border: none;
   margin: 0;
   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);
 }
 
 #urlbar:not(.megabar):-moz-lwtheme,
 #urlbar.megabar:-moz-lwtheme > #urlbar-background,
 #navigator-toolbox #searchbar:-moz-lwtheme {
@@ -96,22 +102,16 @@
 }
 
 #urlbar:not(.megabar):-moz-lwtheme:hover,
 #urlbar.megabar:-moz-lwtheme:hover > #urlbar-background,
 #navigator-toolbox #searchbar:-moz-lwtheme:hover {
   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));
 }
 
 #urlbar:not(.megabar)[focused="true"]:-moz-lwtheme,
 #urlbar.megabar[focused="true"]:-moz-lwtheme > #urlbar-background,
 #navigator-toolbox #searchbar:focus-within:-moz-lwtheme {