Bug 1615907 - Fix the searchbox focus with the default theme. r=aleca
authorRichard Marti <richard.marti@gmail.com>
Sun, 16 Feb 2020 19:46:50 +0100
changeset 37371 aeb27fcae525d98551ac72f2529c310c58575e52
parent 37370 1355f132539c0d44540be799fa0a7b74d52e1ea0
child 37372 2996d7ac481a5afe5dda71ced6a2109f71051a83
push id2566
push userclokep@gmail.com
push dateMon, 09 Mar 2020 19:20:31 +0000
treeherdercomm-beta@a352facfa0a4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaleca
bugs1615907
Bug 1615907 - Fix the searchbox focus with the default theme. r=aleca
mail/themes/linux/mail/searchBox.css
mail/themes/osx/mail/searchBox.css
mail/themes/windows/mail/searchBox.css
--- a/mail/themes/linux/mail/searchBox.css
+++ b/mail/themes/linux/mail/searchBox.css
@@ -35,16 +35,18 @@
   background-color: -moz-field;
   border: 1px solid ThreeDShadow;
   border-radius: 2px;
   box-shadow: 0 1px 4px rgba(0,0,0,.05);
   padding: 3px;
   margin: 0 3px;
 }
 
+.gloda-search:focus,
 .searchBox[focused="true"],
-.themeableSearchBox[focused="true"] {
+.themeableSearchBox:not([disabled="true"]):focus,
+.themeableSearchBox:not([disabled="true"])[focused="true"] {
   border-color: Highlight;
 }
 
 .autocomplete-richlistitem[type^="gloda-"] {
   padding-inline-start: 10px;
 }
--- a/mail/themes/osx/mail/searchBox.css
+++ b/mail/themes/osx/mail/searchBox.css
@@ -22,18 +22,20 @@
   background-clip: padding-box;
   background-image: url("chrome://global/skin/icons/search-textbox.svg");
   background-repeat: no-repeat;
   background-position: 5px center;
   -moz-box-align: center;
 }
 
 /* special treatment because these boxes are on themable toolbars */
+.gloda-search:focus,
 .searchBox[focused="true"],
-.themeableSearchBox[focused="true"] {
+.themeableSearchBox:not([disabled="true"]):focus,
+.themeableSearchBox:not([disabled="true"])[focused="true"] {
   border-color: -moz-mac-focusring;
   box-shadow: var(--focus-ring-box-shadow);
 }
 
 .gloda-search {
   -moz-box-flex: 1;
 }
 
--- a/mail/themes/windows/mail/searchBox.css
+++ b/mail/themes/windows/mail/searchBox.css
@@ -65,18 +65,20 @@
 
 /* Add margins to show the hover box-shadow */
 .gloda-search,
 #peopleSearchInput {
   margin-top: 3px;
   margin-bottom: 3px;
 }
 
+.gloda-search:focus,
 .searchBox[focused="true"],
-.themeableSearchBox[focused="true"] {
+.themeableSearchBox:not([disabled="true"]):focus,
+.themeableSearchBox:not([disabled="true"])[focused="true"] {
   border-color: Highlight;
 }
 
 /* special treatment because these boxes are on themable toolbars */
 .gloda-search,
 #peopleSearchInput,
 .remote-gloda-search {
   min-height: 26px;