Bug 1430165: Input clear icons does not match the design system r=andreio
authormonikamaheshwari <monikamaheshwari1996@gmail.com>
Fri, 17 May 2019 10:11:25 +0000
changeset 533152 a9deeecc3899b5d21081a8408404c2fd60805787
parent 533151 61f89ab0895f18aac004f37ec227997311f94879
child 533153 fb21a998b3272f9947df63ba9acd9cd016571371
push id11276
push userrgurzau@mozilla.com
push dateMon, 20 May 2019 13:11:24 +0000
treeherdermozilla-beta@847755a7c325 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersandreio
bugs1430165
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1430165: Input clear icons does not match the design system r=andreio Differential Revision: https://phabricator.services.mozilla.com/D31189
browser/themes/windows/syncedtabs/sidebar.css
toolkit/themes/linux/global/textbox.css
toolkit/themes/osx/global/icons/searchfield-cancel.svg
toolkit/themes/osx/global/jar.mn
toolkit/themes/shared/icons/searchfield-cancel.svg
toolkit/themes/shared/jar.inc.mn
toolkit/themes/windows/global/icons/Search-close.png
toolkit/themes/windows/global/jar.mn
toolkit/themes/windows/global/textbox.css
--- a/browser/themes/windows/syncedtabs/sidebar.css
+++ b/browser/themes/windows/syncedtabs/sidebar.css
@@ -30,17 +30,17 @@
 
 .search-box > .textbox-input-box:dir(rtl) {
   background-position: right center;
 }
 
 .textbox-search-clear {
   width: 16px;
   height: 16px;
-  background-image: url(chrome://global/skin/icons/Search-close.png);
+  background-image: url(chrome://global/skin/icons/searchfield-cancel.svg);
   background-repeat: no-repeat;
 }
 
 .textbox-search-clear:not([disabled]) {
   cursor: default;
 }
 
 .textbox-search-clear:not([disabled]):hover {
--- a/toolkit/themes/linux/global/textbox.css
+++ b/toolkit/themes/linux/global/textbox.css
@@ -75,17 +75,18 @@ textbox:not([searchbutton]) > .textbox-s
   margin-inline-end: 5px;
 }
 
 .textbox-search-icon[searchbutton] {
   list-style-image: url(chrome://global/skin/icons/search-textbox.svg);
 }
 
 .textbox-search-clear {
-  list-style-image: url(moz-icon://stock/gtk-clear?size=menu);
+  list-style-image: url(chrome://global/skin/icons/searchfield-cancel.svg);
+  -moz-image-region: rect(0, 14px, 14px, 0);
 }
 
 .textbox-search-icon[searchbutton]:not([disabled]) ,
 .textbox-search-clear:not([disabled]) {
   cursor: pointer;
 }
 
 /* ::::: textboxes inside toolbarpaletteitems ::::: */
--- a/toolkit/themes/osx/global/jar.mn
+++ b/toolkit/themes/osx/global/jar.mn
@@ -44,17 +44,16 @@ toolkit.jar:
   skin/classic/global/arrow/arrow-up.gif                             (arrow/arrow-up.gif)
   skin/classic/global/arrow/panelarrow-horizontal.svg                (arrow/panelarrow-horizontal.svg)
   skin/classic/global/arrow/panelarrow-vertical.svg                  (arrow/panelarrow-vertical.svg)
   skin/classic/global/dirListing/dirListing.css                      (dirListing/dirListing.css)
   skin/classic/global/dirListing/folder.png                          (dirListing/folder.png)
   skin/classic/global/dirListing/up.png                              (dirListing/up.png)
   skin/classic/global/icons/blocklist_favicon.png                    (icons/blocklist_favicon.png)
   skin/classic/global/icons/search-textbox.svg                       (icons/search-textbox.svg)
-  skin/classic/global/icons/searchfield-cancel.svg                   (icons/searchfield-cancel.svg)
   skin/classic/global/icons/warning-64.png                           (icons/warning-64.png)
   skin/classic/global/icons/warning-large.png                        (icons/warning-large.png)
   skin/classic/global/icons/error-16.png                             (icons/error-16.png)
   skin/classic/global/icons/error-64.png                             (icons/error-64.png)
   skin/classic/global/icons/question-16.png                          (icons/question-16.png)
   skin/classic/global/icons/question-64.png                          (icons/question-64.png)
   skin/classic/global/icons/sslWarning.png                           (icons/sslWarning.png)
 * skin/classic/global/in-content/common.css                          (in-content/common.css)
rename from toolkit/themes/osx/global/icons/searchfield-cancel.svg
rename to toolkit/themes/shared/icons/searchfield-cancel.svg
--- a/toolkit/themes/shared/jar.inc.mn
+++ b/toolkit/themes/shared/jar.inc.mn
@@ -27,16 +27,17 @@ toolkit.jar:
   skin/classic/global/icons/autoscroll.svg                 (../../shared/icons/autoscroll.svg)
   skin/classic/global/icons/autoscroll-horizontal.svg      (../../shared/icons/autoscroll-horizontal.svg)
   skin/classic/global/icons/autoscroll-vertical.svg        (../../shared/icons/autoscroll-vertical.svg)
   skin/classic/global/icons/calendar-arrow-left.svg        (../../shared/icons/calendar-arrow-left.svg)
   skin/classic/global/icons/calendar-arrow-right.svg       (../../shared/icons/calendar-arrow-right.svg)
   skin/classic/global/icons/check.svg                      (../../shared/icons/check.svg)
   skin/classic/global/icons/check-partial.svg              (../../shared/icons/check-partial.svg)
   skin/classic/global/icons/close.svg                      (../../shared/icons/close.svg)
+  skin/classic/global/icons/searchfield-cancel.svg         (../../shared/icons/searchfield-cancel.svg)
   skin/classic/global/pictureinpicture/close-pip.svg       (../../shared/pictureinpicture/close-pip.svg)
   skin/classic/global/icons/columnpicker.svg               (../../shared/icons/columnpicker.svg)
   skin/classic/global/icons/delete.svg                     (../../shared/icons/delete.svg)
   skin/classic/global/icons/error.svg                      (../../shared/icons/error.svg)
   skin/classic/global/icons/find-previous-arrow.svg        (../../shared/icons/find-previous-arrow.svg)
   skin/classic/global/icons/find-next-arrow.svg            (../../shared/icons/find-next-arrow.svg)
   skin/classic/global/icons/heart.svg                      (../../shared/icons/heart.svg)
   skin/classic/global/icons/help.svg                       (../../shared/icons/help.svg)
@@ -109,9 +110,8 @@ toolkit.jar:
   skin/classic/global/plugins/plugin-blocked.svg            (../../shared/plugins/plugin-blocked.svg)
   skin/classic/global/plugins/pluginGeneric.svg             (../../shared/extensions/category-plugins.svg)
   skin/classic/global/plugins/pluginProblem.css             (../../shared/plugins/pluginProblem.css)
   skin/classic/global/plugins/contentPluginBlocked.png      (../../shared/plugins/contentPluginBlocked.png)
   skin/classic/global/plugins/contentPluginCrashed.png      (../../shared/plugins/contentPluginCrashed.png)
   skin/classic/global/plugins/contentPluginStripe.png       (../../shared/plugins/contentPluginStripe.png)
   skin/classic/global/pictureinpicture/player.css           (../../shared/pictureinpicture/player.css)
   skin/classic/global/media/pictureinpicture.svg            (../../shared/media/pictureinpicture.svg)
-
deleted file mode 100644
index 7faca922a93288cb07b94f6af52c8595f84dd7fd..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/toolkit/themes/windows/global/jar.mn
+++ b/toolkit/themes/windows/global/jar.mn
@@ -41,17 +41,16 @@ toolkit.jar:
   skin/classic/global/dirListing/up.png                    (dirListing/up.png)
   skin/classic/global/icons/blocklist_favicon.png          (icons/blocklist_favicon.png)
   skin/classic/global/icons/Error.png                      (icons/Error.png)
   skin/classic/global/icons/collapse.png                   (icons/collapse.png)
   skin/classic/global/icons/expand.png                     (icons/expand.png)
   skin/classic/global/icons/Landscape.png                  (icons/Landscape.png)
   skin/classic/global/icons/Portrait.png                   (icons/Portrait.png)
   skin/classic/global/icons/Print-preview.png              (icons/Print-preview.png)
-  skin/classic/global/icons/Search-close.png               (icons/Search-close.png)
   skin/classic/global/icons/sslWarning.png                 (icons/sslWarning.png)
   skin/classic/global/icons/warning-large.png              (icons/warning-large.png)
   skin/classic/global/icons/windowControls.png             (icons/windowControls.png)
 * skin/classic/global/in-content/common.css                (in-content/common.css)
 * skin/classic/global/in-content/info-pages.css            (in-content/info-pages.css)
   skin/classic/global/tree/sort-asc.svg                    (tree/sort-asc.svg)
   skin/classic/global/tree/sort-dsc.svg                    (tree/sort-dsc.svg)
   skin/classic/global/tree/sort-asc-classic.png            (tree/sort-asc-classic.png)
--- a/toolkit/themes/windows/global/textbox.css
+++ b/toolkit/themes/windows/global/textbox.css
@@ -89,18 +89,18 @@ textbox:not([searchbutton]) > .textbox-s
   transform: scaleX(-1);
 }
 
 .textbox-search-icon[searchbutton]:not([disabled]) {
   cursor: pointer;
 }
 
 .textbox-search-clear {
-  list-style-image: url(chrome://global/skin/icons/Search-close.png);
-  -moz-image-region: rect(0, 16px, 16px, 0);
+  list-style-image: url(chrome://global/skin/icons/searchfield-cancel.svg);
+  -moz-image-region: rect(0, 14px, 14px, 0);
 }
 
 .textbox-search-clear:not([disabled]) {
   cursor: default;
 }
 
 .textbox-search-clear:not([disabled]):hover {
   -moz-image-region: rect(0, 32px, 16px, 16px);