Bug 1499678 - Fix the searchBox on Mac after bug 1473927 loading the textbox.css as document stylesheet. r=Arshad
authorRichard Marti <richard.marti@gmail.com>
Fri, 19 Oct 2018 12:50:55 +0200
changeset 33428 709b0433a89eca551383887e8d2c8edef1b001ed
parent 33427 d56379e7d07557b787107074102eaedd841d9280
child 33429 c7cffab8f15a95dbb7c7fdf688f52bef097a6417
push id387
push userclokep@gmail.com
push dateMon, 10 Dec 2018 21:30:47 +0000
reviewersArshad
bugs1499678, 1473927
Bug 1499678 - Fix the searchBox on Mac after bug 1473927 loading the textbox.css as document stylesheet. r=Arshad
mail/themes/osx/mail/searchBox.css
--- a/mail/themes/osx/mail/searchBox.css
+++ b/mail/themes/osx/mail/searchBox.css
@@ -6,24 +6,31 @@
 
 :root {
   --toolbar-field-focus-border-color: -moz-mac-focusring;
 }
 
 .searchBox {
   margin-top: 3px;
   margin-bottom: 2px;
-  -moz-appearance: none;
-  background-clip: padding-box;
+  -moz-appearance: none !important;
   border: 1px solid hsla(240,5%,5%,.25);
   border-radius: 3px;
   box-shadow: 0 1px 4px rgba(0,0,0,.05);
-  font: icon;
+  font: icon !important;
   height: 24px;
-  padding: 1px 4px;
+  padding: 1px 4px !important;
+  padding-inline-start: 19px !important;
+  -moz-context-properties: fill, fill-opacity;
+  fill: currentColor;
+  fill-opacity: 0.8;
+  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;
 }
 
 .searchBox:hover,
 #view-task-edit-field:hover,
 #unifinder-task-edit-field:hover {
   border-color: hsla(240,5%,5%,.35);
   box-shadow: 0 1px 6px rgba(0,0,0,.1);
@@ -73,36 +80,16 @@
 .remote-gloda-search:-moz-lwtheme[focused="true"] {
   background-color: var(--lwt-toolbar-field-focus, var(--lwt-toolbar-field-background-color, white));
   color: var(--lwt-toolbar-field-focus-color, var(--lwt-toolbar-field-color, black));
   border-color: var(--toolbar-field-focus-border-color);
   box-shadow: 0 0 0 1px var(--toolbar-field-focus-border-color) inset,
               0 0 0 1px var(--toolbar-field-focus-border-color);
 }
 
-.searchBox > .textbox-input-box:before {
-  /* Because of bug 853415, we need to ordinal this to the first position: */
-  -moz-box-ordinal-group: 0;
-  content: '';
-  display: block;
-  -moz-box-align: center;
-  width: 16px;
-  height: 16px;
-  margin-inline-end: 4px;
-  background-image: url(chrome://messenger/skin/icons/search-glass.svg);
-  background-size: 16px 16px;
-  -moz-context-properties: fill;
-  fill: currentColor;
-  opacity: 0.5;
-}
-
-.searchBox:-moz-locale-dir(rtl) > .textbox-input-box:before {
-  transform: scaleX(-1);
-}
-
 .remote-gloda-search-container {
   padding-top: 1px;
   padding-bottom: 1px;
 }
 
 #PopupGlodaAutocomplete {
   margin-top: -1px;
   background: var(--autocomplete-popup-background);