Bug 1380268 - Let the new search textbox styling graduate from in-content/common.inc.css to textbox.css. r?nhnt11 draft
authorDão Gottwald <dao@mozilla.com>
Mon, 17 Jul 2017 18:19:00 +0200
changeset 609858 937e5ceb14914b5e383333ae6a4bb86c83495ce7
parent 609768 d43779e278d2e4d3e21dba2fcb585a3bf4b1288e
child 637695 29be12cd1d400a2d78372433af37175b19dab898
push id68711
push userdgottwald@mozilla.com
push dateMon, 17 Jul 2017 16:19:33 +0000
reviewersnhnt11
bugs1380268
milestone56.0a1
Bug 1380268 - Let the new search textbox styling graduate from in-content/common.inc.css to textbox.css. r?nhnt11 MozReview-Commit-ID: 24HRgvmSVtb
browser/themes/linux/syncedtabs/sidebar.css
browser/themes/windows/syncedtabs/sidebar.css
toolkit/themes/linux/global/textbox.css
toolkit/themes/osx/global/in-content/common.css
toolkit/themes/shared/in-content/common.inc.css
toolkit/themes/windows/global/icons/Search-glass.png
toolkit/themes/windows/global/jar.mn
toolkit/themes/windows/global/textbox.css
--- a/browser/themes/linux/syncedtabs/sidebar.css
+++ b/browser/themes/linux/syncedtabs/sidebar.css
@@ -41,17 +41,17 @@ html {
 .textbox-search-clear {
   background-image: url(moz-icon://stock/gtk-clear?size=menu);
   background-repeat: no-repeat;
   width: 16px;
   height: 16px;
 }
 
 .textbox-search-icon {
-  background-image: url(moz-icon://stock/gtk-find?size=menu);
+  background-image: url(chrome://global/skin/icons/search-textbox.svg);
   background-repeat: no-repeat;
   width: 16px;
   height: 16px;
   display: block;
 }
 
 .textbox-search-icon[searchbutton]:not([disabled]) ,
 .textbox-search-clear:not([disabled]) {
--- a/browser/themes/windows/syncedtabs/sidebar.css
+++ b/browser/themes/windows/syncedtabs/sidebar.css
@@ -29,17 +29,17 @@ html {
   padding: 2px 2px 3px;
   padding-inline-start: 4px;
   color: -moz-FieldText;
 }
 
 .textbox-search-icon {
   width: 16px;
   height: 16px;
-  background-image: url(chrome://global/skin/icons/Search-glass.png);
+  background-image: url(chrome://global/skin/icons/search-textbox.svg);
   background-repeat: no-repeat;
   display: block;
 }
 
 .textbox-search-icon:-moz-locale-dir(rtl) {
   transform: scaleX(-1);
 }
 
--- a/toolkit/themes/linux/global/textbox.css
+++ b/toolkit/themes/linux/global/textbox.css
@@ -62,18 +62,23 @@ textbox.plain {
 
 textbox.plain html|*.textbox-input,
 textbox.plain html|*.textbox-textarea {
   padding: 0px !important;
 }
 
 /* ::::: search textbox ::::: */
 
-.textbox-search-icon {
-  list-style-image: url(moz-icon://stock/gtk-find?size=menu);
+textbox:not([searchbutton]) > .textbox-input-box > .textbox-search-sign {
+  list-style-image: url(chrome://global/skin/icons/search-textbox.svg);
+  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);
 }
 
 .textbox-search-icon[searchbutton]:not([disabled]) ,
 .textbox-search-clear:not([disabled]) {
--- a/toolkit/themes/osx/global/in-content/common.css
+++ b/toolkit/themes/osx/global/in-content/common.css
@@ -119,8 +119,14 @@ xul|*.spinbuttons-down  {
 xul|*.spinbuttons-button > xul|*.button-box {
   padding-inline-start: 2px !important;
   padding-inline-end: 3px !important;
 }
 
 xul|*.spinbuttons-button > xul|*.button-box > xul|*.button-text {
   display: none;
 }
+
+xul|textbox[type="search"]:not([searchbutton]) > .textbox-input-box > .textbox-search-sign {
+  list-style-image: url(chrome://global/skin/icons/search-textbox.svg);
+  margin-inline-end: 5px;
+}
+
--- a/toolkit/themes/shared/in-content/common.inc.css
+++ b/toolkit/themes/shared/in-content/common.inc.css
@@ -486,25 +486,16 @@ xul|textbox {
 /* Create a separate rule to unset these styles on .tree-input instead of
    using :not(.tree-input) so the selector specifity doesn't change. */
 xul|textbox.tree-input {
   min-height: unset;
   padding-right: unset;
   padding-left: unset;
 }
 
-xul|textbox[type="search"]:not([searchbutton]) > .textbox-input-box > .textbox-search-icons > .textbox-search-icon {
-  visibility: hidden;
-}
-
-xul|textbox[type="search"]:not([searchbutton]) > .textbox-input-box > .textbox-search-sign {
-  list-style-image: url(chrome://global/skin/icons/search-textbox.svg);
-  margin-inline-end: 5px;
-}
-
 html|input[type="email"],
 html|input[type="tel"],
 html|input[type="text"],
 html|textarea {
   font-family: inherit;
   font-size: inherit;
   padding: 5px 10px;
 }
deleted file mode 100644
index 16a75cf29723e8eb699b8739a5081b6aed32f584..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/toolkit/themes/windows/global/jar.mn
+++ b/toolkit/themes/windows/global/jar.mn
@@ -51,17 +51,16 @@ toolkit.jar:
   skin/classic/global/icons/collapse.png                   (icons/collapse.png)
   skin/classic/global/icons/expand.png                     (icons/expand.png)
   skin/classic/global/icons/folder-item.png                (icons/folder-item.png)
   skin/classic/global/icons/information-16.png             (icons/information-16.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/Search-glass.png               (icons/Search-glass.png)
   skin/classic/global/icons/Question.png                   (icons/Question.png)
   skin/classic/global/icons/resizer.png                    (icons/resizer.png)
   skin/classic/global/icons/sslWarning.png                 (icons/sslWarning.png)
   skin/classic/global/icons/Warning.png                    (icons/Warning.png)
   skin/classic/global/icons/windowControls.png             (icons/windowControls.png)
   skin/classic/global/icons/warning-large.png              (icons/warning-large.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)
--- a/toolkit/themes/windows/global/textbox.css
+++ b/toolkit/themes/windows/global/textbox.css
@@ -68,19 +68,23 @@ textbox.plain {
 
 textbox.plain html|*.textbox-input,
 textbox.plain html|*.textbox-textarea {
   padding: 0px !important;
 }
 
 /* ::::: search textbox ::::: */
 
-.textbox-search-icon {
-  list-style-image: url(chrome://global/skin/icons/Search-glass.png);
-  -moz-image-region: rect(0, 16px, 16px, 0);
+textbox:not([searchbutton]) > .textbox-input-box > .textbox-search-sign {
+  list-style-image: url(chrome://global/skin/icons/search-textbox.svg);
+  margin-inline-end: 5px;
+}
+
+.textbox-search-icon[searchbutton] {
+  list-style-image: url(chrome://global/skin/icons/search-textbox.svg);
 }
 
 .textbox-search-icon:-moz-locale-dir(rtl) {
   transform: scaleX(-1);
 }
 
 .textbox-search-icon[searchbutton]:not([disabled]) {
   cursor: pointer;
@@ -90,23 +94,21 @@ textbox.plain html|*.textbox-textarea {
   list-style-image: url(chrome://global/skin/icons/Search-close.png);
   -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
 .textbox-search-clear:not([disabled]) {
   cursor: default;
 }
 
-.textbox-search-clear:not([disabled]):hover ,
-.textbox-search-icon[searchbutton]:not([disabled]):hover {
+.textbox-search-clear:not([disabled]):hover {
   -moz-image-region: rect(0, 32px, 16px, 16px);
 }
 
-.textbox-search-clear:not([disabled]):hover:active ,
-.textbox-search-icon[searchbutton]:not([disabled]):hover:active {
+.textbox-search-clear:not([disabled]):hover:active {
   -moz-image-region: rect(0, 48px, 16px, 32px);
 }
 
 /* ::::: textboxes inside toolbarpaletteitems ::::: */
 
 toolbarpaletteitem > toolbaritem > textbox > .textbox-input-box > html|*.textbox-input {
   visibility: hidden;
 }