Bug 1554382 - Use the Photon clear button in the QFB searchbox. r=aceman
authorRichard Marti <richard.marti@gmail.com>
Sun, 26 May 2019 00:38:07 +0200
changeset 35689 a37b55df5e0baa88da4816cfd4f3ca96b6633f79
parent 35688 650172622d9943613c3739eb920bd050bcea1cb9
child 35690 0820221247ce8a27975477e3ad43dede079dd9c2
push id392
push userclokep@gmail.com
push dateMon, 02 Sep 2019 20:17:19 +0000
reviewersaceman
bugs1554382
Bug 1554382 - Use the Photon clear button in the QFB searchbox. r=aceman
mail/themes/linux/mail/searchBox.css
mail/themes/osx/mail/searchBox.css
mail/themes/shared/jar.inc.mn
mail/themes/shared/mail/icons/search-close.svg
mail/themes/windows/mail/searchBox.css
--- a/mail/themes/linux/mail/searchBox.css
+++ b/mail/themes/linux/mail/searchBox.css
@@ -30,29 +30,24 @@
 textbox:not([searchbutton]) > .textbox-input-box > .textbox-search-sign {
   list-style-image: url(chrome://messenger/skin/icons/search-glass.svg);
   -moz-context-properties: fill;
   fill: currentColor;
   opacity: 0.54;
 }
 
 .textbox-search-clear {
-  list-style-image: url(chrome://messenger/skin/icons/search-close.svg);
-  -moz-context-properties: fill;
-  fill: currentColor;
   opacity: 0.8;
 }
 
 .textbox-search-clear:not([disabled]):hover {
-  -moz-image-region: auto;
   opacity: 1;
 }
 
 .textbox-search-clear:not([disabled]):hover:active {
-  -moz-image-region: auto;
   transform: scale(0.8);
 }
 
 .remote-gloda-search-container {
   padding-top: 3px;
   padding-bottom: 2px;
 }
 
--- a/mail/themes/osx/mail/searchBox.css
+++ b/mail/themes/osx/mail/searchBox.css
@@ -95,16 +95,28 @@
 :root[lwt-selection] #IMSearchInput .textbox-input:-moz-lwtheme::selection,
 :root[lwt-selection] #peopleSearchInput .textbox-input:-moz-lwtheme::selection,
 :root[lwt-selection] .themeableSearchBox .textbox-input:-moz-lwtheme::selection,
 :root[lwt-selection] .remote-gloda-search .textbox-input:-moz-lwtheme::selection {
   background-color: var(--lwt-toolbar-field-highlight, Highlight);
   color: var(--lwt-toolbar-field-highlight-text, HighlightText);
 }
 
+.textbox-search-clear {
+  opacity: 0.8;
+}
+
+.textbox-search-clear:not([disabled]):hover {
+  opacity: 1;
+}
+
+.textbox-search-clear:not([disabled]):hover:active {
+  transform: scale(0.8);
+}
+
 .remote-gloda-search-container {
   padding-top: 1px;
   padding-bottom: 1px;
 }
 
 #PopupGlodaAutocomplete {
   margin-top: -1px;
   background: var(--autocomplete-popup-background);
--- a/mail/themes/shared/jar.inc.mn
+++ b/mail/themes/shared/jar.inc.mn
@@ -134,14 +134,13 @@
   skin/classic/messenger/icons/italics.svg                    (../shared/mail/icons/italics.svg)
   skin/classic/messenger/icons/justify.svg                    (../shared/mail/icons/justify.svg)
   skin/classic/messenger/icons/left-align.svg                 (../shared/mail/icons/left-align.svg)
   skin/classic/messenger/icons/link.svg                       (../shared/mail/icons/link.svg)
   skin/classic/messenger/icons/number-list.svg                (../shared/mail/icons/number-list.svg)
   skin/classic/messenger/icons/outdent.svg                    (../shared/mail/icons/outdent.svg)
   skin/classic/messenger/icons/quit.svg                       (../shared/mail/icons/quit.svg)
   skin/classic/messenger/icons/right-align.svg                (../shared/mail/icons/right-align.svg)
-  skin/classic/messenger/icons/search-close.svg               (../shared/mail/icons/search-close.svg)
   skin/classic/messenger/icons/size.svg                       (../shared/mail/icons/size.svg)
   skin/classic/messenger/icons/smiley.svg                     (../shared/mail/icons/smiley.svg)
   skin/classic/messenger/icons/table.svg                      (../shared/mail/icons/table.svg)
   skin/classic/messenger/icons/underline.svg                  (../shared/mail/icons/underline.svg)
 #endif
deleted file mode 100644
--- a/mail/themes/shared/mail/icons/search-close.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
-  <path fill="context-fill" d="M 4.9,4 4,4.9 7.1,8 4,11.1 4.9,12 8,8.9 11.1,12 12,11.1 8.9,8 12,4.9 11.1,4 8,7.1 Z"/>
-</svg>
--- a/mail/themes/windows/mail/searchBox.css
+++ b/mail/themes/windows/mail/searchBox.css
@@ -47,29 +47,24 @@ textbox:not([searchbutton]) > .textbox-i
 textbox:not([searchbutton]) > .textbox-input-box > .textbox-search-sign {
   list-style-image: url(chrome://messenger/skin/icons/search-glass.svg);
   -moz-context-properties: fill;
   fill: currentColor;
   opacity: 0.54;
 }
 
 .textbox-search-clear {
-  list-style-image: url(chrome://messenger/skin/icons/search-close.svg);
-  -moz-context-properties: fill;
-  fill: currentColor;
   opacity: 0.8;
 }
 
 .textbox-search-clear:not([disabled]):hover {
-  -moz-image-region: auto;
   opacity: 1;
 }
 
 .textbox-search-clear:not([disabled]):hover:active {
-  -moz-image-region: auto;
   transform: scale(0.8);
 }
 
 .remote-gloda-search-container {
   padding-top: 1px;
   padding-bottom: 1px;
 }