From 53e8bd2ac04af0149bb907b931eea308076474ed Mon Sep 17 00:00:00 2001
From: NTD <ntd@nonexist.net>
Date: Fri, 13 Apr 2018 12:49:13 -0400
Subject: [PATCH] Restyle the findbar

---
 toolkit/content/widgets/findbar.xml           |  58 ++--
 .../locales/en-US/chrome/global/findbar.dtd   |   4 +
 toolkit/themes/linux/global/findBar.css       | 171 ++++-------
 toolkit/themes/linux/global/icons/find.png    | Bin 0 -> 1498 bytes
 toolkit/themes/linux/global/jar.mn            |   1 +
 toolkit/themes/osx/global/findBar.css         | 269 +++++++++---------
 toolkit/themes/windows/global/findBar.css     | 173 +++++------
 toolkit/themes/windows/global/icons/find.png  | Bin 0 -> 1736 bytes
 toolkit/themes/windows/global/jar.mn          |   1 +
 9 files changed, 293 insertions(+), 384 deletions(-)
 create mode 100644 toolkit/themes/linux/global/icons/find.png
 create mode 100644 toolkit/themes/windows/global/icons/find.png

diff --git a/toolkit/content/widgets/findbar.xml b/toolkit/content/widgets/findbar.xml
index f90d412275..b92fb1d051 100644
--- a/toolkit/content/widgets/findbar.xml
+++ b/toolkit/content/widgets/findbar.xml
@@ -162,21 +162,29 @@
     <content hidden="true">
     <xul:hbox anonid="findbar-container" class="findbar-container" flex="1" align="center">
       <xul:hbox anonid="findbar-textbox-wrapper" align="stretch">
+      <xul:toolbarbutton anonid="find-closebutton"
+                         class="findbar-closebutton close-icon"
+                         tooltiptext="&findCloseButton.tooltip;"
+                         oncommand="close();"/>
         <xul:textbox anonid="findbar-textbox"
                      class="findbar-textbox findbar-find-fast"
                      xbl:inherits="flash"/>
-        <xul:toolbarbutton anonid="find-previous"
-                           class="findbar-find-previous tabbable"
-                           tooltiptext="&previous.tooltip;"
-                           oncommand="onFindAgainCommand(true);"
-                           disabled="true"
-                           xbl:inherits="accesskey=findpreviousaccesskey"/>
-        <xul:toolbarbutton anonid="find-next"
+         <xul:toolbarbutton anonid="find-next"
                            class="findbar-find-next tabbable"
+                           label="&next.label;"
+                           accesskey="&next.accesskey;"
                            tooltiptext="&next.tooltip;"
                            oncommand="onFindAgainCommand(false);"
                            disabled="true"
                            xbl:inherits="accesskey=findnextaccesskey"/>
+       <xul:toolbarbutton anonid="find-previous"
+                           class="findbar-find-previous tabbable"
+                           label="&previous.label;"
+                           accesskey="&previous.accesskey;"
+                           tooltiptext="&previous.tooltip;"
+                           oncommand="onFindAgainCommand(true);"
+                           disabled="true"
+                           xbl:inherits="accesskey=findpreviousaccesskey"/>
       </xul:hbox>
       <xul:toolbarbutton anonid="highlight"
                          class="findbar-highlight findbar-button tabbable"
@@ -186,22 +194,22 @@
                          oncommand="toggleHighlight(this.checked);"
                          type="checkbox"
                          xbl:inherits="accesskey=highlightaccesskey"/>
-      <xul:toolbarbutton anonid="find-case-sensitive"
-                         class="findbar-case-sensitive findbar-button tabbable"
-                         label="&caseSensitive.label;"
-                         accesskey="&caseSensitive.accesskey;"
-                         tooltiptext="&caseSensitive.tooltiptext;"
-                         oncommand="_setCaseSensitivity(this.checked ? 1 : 0);"
-                         type="checkbox"
-                         xbl:inherits="accesskey=matchcaseaccesskey"/>
-      <xul:toolbarbutton anonid="find-entire-word"
-                         class="findbar-entire-word findbar-button tabbable"
-                         label="&entireWord.label;"
-                         accesskey="&entireWord.accesskey;"
-                         tooltiptext="&entireWord.tooltiptext;"
-                         oncommand="toggleEntireWord(this.checked);"
-                         type="checkbox"
-                         xbl:inherits="accesskey=entirewordaccesskey"/>
+      <xul:checkbox anonid="find-case-sensitive"
+                     class="findbar-case-sensitive findbar-button tabbable"
+                     label="&caseSensitive.label;"
+                     accesskey="&caseSensitive.accesskey;"
+                     tooltiptext="&caseSensitive.tooltiptext;"
+                     oncommand="_setCaseSensitivity(this.checked ? 1 : 0);"
+                     type="checkbox"
+                     xbl:inherits="accesskey=matchcaseaccesskey"/>
+      <xul:checkbox anonid="find-entire-word"
+                     class="findbar-entire-word findbar-button tabbable"
+                     label="&entireWord.label;"
+                     accesskey="&entireWord.accesskey;"
+                     tooltiptext="&entireWord.tooltiptext;"
+                     oncommand="toggleEntireWord(this.checked);"
+                     type="checkbox"
+                     xbl:inherits="accesskey=entirewordaccesskey"/>
       <xul:label anonid="match-case-status" class="findbar-find-fast"/>
       <xul:label anonid="entire-word-status" class="findbar-find-fast"/>
       <xul:label anonid="found-matches" class="findbar-find-fast found-matches" hidden="true"/>
@@ -212,10 +220,6 @@
       <!-- Do not use value, first child is used because it provides a11y with text change events -->
       </xul:description>
     </xul:hbox>
-    <xul:toolbarbutton anonid="find-closebutton"
-                       class="findbar-closebutton close-icon"
-                       tooltiptext="&findCloseButton.tooltip;"
-                       oncommand="close();"/>
     </content>
 
     <implementation implements="nsIMessageListener, nsIEditActionListener">
diff --git a/toolkit/locales/en-US/chrome/global/findbar.dtd b/toolkit/locales/en-US/chrome/global/findbar.dtd
index ad77130bca..a90c77c7ec 100644
--- a/toolkit/locales/en-US/chrome/global/findbar.dtd
+++ b/toolkit/locales/en-US/chrome/global/findbar.dtd
@@ -5,7 +5,11 @@
 <!-- LOCALIZATION NOTE : FILE This file contains the entities needed to -->
 <!-- LOCALIZATION NOTE : FILE use the Find Bar. --> 
 
+<!ENTITY next.label "Next">
+<!ENTITY next.accesskey "N">
 <!ENTITY next.tooltip "Find the next occurrence of the phrase">
+<!ENTITY previous.label "Previous">
+<!ENTITY previous.accesskey "P">
 <!ENTITY previous.tooltip "Find the previous occurrence of the phrase">
 <!ENTITY findCloseButton.tooltip "Close find bar">
 <!ENTITY highlightAll.label "Highlight All">
diff --git a/toolkit/themes/linux/global/findBar.css b/toolkit/themes/linux/global/findBar.css
index f049114024..e3e2ad0865 100644
--- a/toolkit/themes/linux/global/findBar.css
+++ b/toolkit/themes/linux/global/findBar.css
@@ -7,6 +7,7 @@
 findbar {
   border-top: 2px solid;
   -moz-border-top-colors: ThreeDShadow ThreeDHighlight;
+  padding-bottom: 1px;
   min-width: 1px;
   transition-property: margin-bottom, opacity, visibility;
   transition-duration: 150ms, 150ms, 0s;
@@ -22,138 +23,66 @@ findbar[hidden] {
   transition-delay: 0s, 0s, 150ms;
 }
 
-findbar[noanim] {
-  transition-duration: 0s !important;
-  transition-delay: 0s !important;
+/* find-next button */
+
+.findbar-find-next > .toolbarbutton-icon {
+  -moz-appearance: button-arrow-next;
 }
 
-.findbar-container {
-  padding-inline-start: 8px;
-  padding-top: 4px;
-  padding-bottom: 4px;
+/* find-previous button */
+
+.findbar-find-previous > .toolbarbutton-icon {
+  -moz-appearance: button-arrow-previous;
 }
 
-.findbar-closebutton {
-  -moz-appearance: none;
+/* highlight button */
+
+.findbar-highlight {
+  list-style-image: url("chrome://global/skin/icons/find.png");
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
+}
+
+.findbar-highlight[disabled="true"] {
+  -moz-image-region: rect(16px, 16px, 32px, 0px);
+}
+
+.find-status-icon {
+  list-style-image: none;
+  margin-top: 2px;
+  margin-bottom: 0;
+  -moz-margin-start: 12px;
+  -moz-margin-end: 0;
   width: 16px;
   height: 16px;
-  margin: 0 8px;
-}
-
-/* Search field */
-
-.findbar-textbox {
-  -moz-appearance: none;
-  border: 1px solid ThreeDShadow;
-  box-shadow: 0 0 1px 0 ThreeDShadow inset;
-  margin: 0;
-  padding: 5px;
-  width: 14em;
-}
-
-.findbar-textbox:-moz-locale-dir(ltr) {
-  border-radius: 3px 0 0 3px;
-  border-right-width: 0;
-}
-
-.findbar-textbox:-moz-locale-dir(rtl) {
-  border-radius: 0 3px 3px 0;
-  border-left-width: 0;
-}
-
-.findbar-textbox[focused="true"] {
-  border-color: Highlight;
-  box-shadow: 0 0 1px 0 Highlight inset;
-}
-
-.findbar-textbox[status="notfound"] {
-  background-color: #f66;
-  color: white;
-}
-
-.findbar-textbox[flash="true"] {
-  background-color: yellow;
-  color: black;
-}
-
-.findbar-textbox.minimal {
-  border-width: 1px;
-  border-radius: 3px;
-}
-
-.findbar-find-previous,
-.findbar-find-next {
-  margin-inline-start: 0;
-  -moz-appearance: none;
-  background: linear-gradient(rgba(255,255,255,.8) 1px, rgba(255,255,255,.4) 1px, rgba(255,255,255,.1));
-  border: 1px solid ThreeDShadow;
-  padding: 5px 9px;
-  line-height: 1em;
-}
-
-.findbar-find-previous:focus,
-.findbar-find-next:focus {
-  border-color: Highlight;
-  box-shadow: 0 0 1px 0 Highlight inset;
-}
-
-.findbar-find-previous:not([disabled]):active,
-.findbar-find-next:not([disabled]):active {
-  background: rgba(23,50,76,.2);
-  border: 1px solid ThreeDShadow;
-  box-shadow: 0 1px 2px rgba(10,31,51,.2) inset;
-}
-
-.findbar-find-previous {
-  list-style-image: url(chrome://global/skin/icons/find-arrows.svg#glyph-find-previous);
-  border-inline-end-width: 0;
-}
-
-.findbar-find-next {
-  list-style-image: url(chrome://global/skin/icons/find-arrows.svg#glyph-find-next);
-}
-
-.findbar-find-previous > .toolbarbutton-icon,
-.findbar-find-next > .toolbarbutton-icon {
-  margin: 0;
-}
-
-.findbar-find-previous[disabled="true"] > .toolbarbutton-icon,
-.findbar-find-next[disabled="true"] > .toolbarbutton-icon {
-  opacity: .5;
-}
-
-.findbar-find-next:-moz-locale-dir(ltr) {
-  border-top-right-radius: 2px;
-  border-bottom-right-radius: 2px;
-}
-
-.findbar-find-next:-moz-locale-dir(rtl) {
-  border-top-left-radius: 2px;
-  border-bottom-left-radius: 2px;
-}
-
-.findbar-find-previous:focus + .findbar-find-next {
-  border-inline-start-width: 0;
-}
-
-.findbar-find-previous:focus {
-  border-inline-end-width: 1px;
-}
-
-.findbar-highlight,
-.findbar-case-sensitive,
-.findbar-entire-word {
-  margin-inline-start: 5px;
 }
 
 .findbar-find-status,
 .findbar-matches {
-  color: GrayText;
-  margin: 0 !important;
-  margin-inline-start: 12px !important;
+  margin-top: 0 !important;
+  margin-bottom: 0 !important;
+  -moz-margin-start: 3px !important;
+  -moz-margin-end: 0 !important;
+  padding: 2px !important;
+}
+
+.find-status-icon[status="notfound"] {
+  list-style-image: url("moz-icon://stock/gtk-dialog-error?size=menu");
 }
 
 .find-status-icon[status="pending"] {
-  list-style-image: url("chrome://global/skin/icons/loading.png");
+  list-style-image: url("chrome://global/skin/icons/loading_16.png");
+}
+
+.findbar-textbox[status="notfound"] {
+  box-shadow: 0 0 0 1em #f66 inset;
+  color: white;
+}
+
+.findbar-textbox[flash="true"] {
+  box-shadow: 0 0 0 1em yellow inset;
+  color: black;
+}
+
+.find-status-icon[status="wrapped"] {
+  list-style-image: url("chrome://global/skin/icons/wrap.png");
 }
diff --git a/toolkit/themes/linux/global/icons/find.png b/toolkit/themes/linux/global/icons/find.png
new file mode 100644
index 0000000000000000000000000000000000000000..cceed403e544492ee757a93e2e2936ff082406c6
GIT binary patch
literal 1498
zcmV<01tt24P)<h;3K|Lk000e1NJLTq000mG001Be1^@s68;SVL00007bV*G`2iO4>
z3J?>k^=zg9000JJOGiWi{{a60|De66lK=n!32;bRa{vGf6951U69E94oEQKA1!qY_
zK~zY`jg@_DQ)Lv!pL^S`YqyoLjdij)_6dv)lsQJHh&aKI2&fnpf`CSeE{g$_s9`SA
z3<Uf`W7Gr#N=y(m{((vqb$nz3@|6+U=wM@8#|B&5^}D@o@3-gHZ43eRByZmKrqAy=
z?>XnaWpIn|UVu4m%E2@_-o~o3Gh)v9D2&?#bCb9o<w=$$OHI}fGUJ}jjKMsY)0<{F
zA@%mCqN7cp(KK{hK+uj<8HQ#{iM@>Xe?Ea_jWC#PF@_NaAv!u$skc>?297H-*KEu^
zs@?=3_g%?Z8`l`p9@UGXy_y)hqyj*4K&1t-*R9BbBZ?gPi6HyU1?RajfY*+4hRr^c
zUTQbTTyH~XEJy&Lct*vv4}ye{W$tI%_oWtH+{27>UuUv5eW*{aU?uJl3@J9S`V10k
z?!AdD6gjMkX^&{2Z)trw2Jl_LQY2M>KcVmdqY8GgIwMrE=ek&OC)`KG+VX-;-@%M)
z-BLwK{!Wq$k}`_FKvK$7sPPsku@-_{880099EIMp{I}~FbQsT?QY)$y<MVKLe*!uR
ztkX6@&juk!_Ce;mp(xiO&=*6Lr(R=5+$$K?blPHl+00tr1n=Gmzxy(V9G$QhJ_~Ef
zb99_@kiz>RiF6c&N0Q}5be`HBW&U<g*<(z5aJeaKgAPg<N@O=gQ9+y+G2GXUpl29U
z?p}=v*4dCE2cfDALjIWA*LL6(L++UjlRRL#bC*e%vKVrBCsp1~?emk9N)QEHI0BcW
zgPs|YQ~CgO`egK;+Z*L$(K(FIZhFUHdAuPdXL~YWfExV~syqm2iy&HP*+e)QzM)nj
z>Ua0YICWT&(J*ffjxxTEG-p~ti&ZO{HZZDiiNr$$xkfuJ#YYGgvgC)yc_JiAa#6ut
zc*pL7ufx)nJgKqRl(~T=FA{`E?4sWHLlL{^Q5$_9M#SI3QT6LHE7Y%UxJ*=o5=NK4
zN0kHBx4NApp)!o&>x^=7)qh@REt=k|XIHGO*Snn8z;R*u;YXIq|NDJF;*`?TnVAb0
zJ!v?8>=)$b70Om?t`H1*<AH!La{v6tgxdnPG`*$+*jcaEZ8EpEp3oZ%2IS=xC=`4!
z;Ee@>zHm6?4?g|OTK_Ep<UY+-v(Q>xT*lb#t(q9=6SF{Kkh`{v@p#lP2yvev2%eYL
zz9lo`Q#YGaE9>eT*~5o^z{H7}TKb4ZIZ*lu02c{@=Xs0(+^^I%xW)r=7c5v@l5L#~
zM{j3BY&M%o>_@=wK``V8ACHX!XbHmtA0HYI$jr&fuUN6N4xV8rwDbG@nzIL?pik?@
zc(JyNMx*IQ0L$vjQ&ZEKr<Sck)}$N^^!Fr|=1y)2fGF~b&l+S#d8L00uyymg%A7m$
z(x#VH;@I!a$j+XOhZZe?Bnh}k1@(E|;01ov9qH*=uvjv9X0(6?y`i#d&V07oR*S>U
z`!P6p6<7KkxM$9NsH(abF6RI`JKGb56h#qt&91@G!@nvCz_#~aFDopXHpynIWi)zw
z`&n|9C{+Ph2m0aj`7m#OE%Nh=(9>;CWXy3K&Yn3LV#wW~*XeCbo>;|}mX_oEpC{q*
zIO#nQhe~%=5G8Wu(AU=s`W?z<%!DDyh(C@UQDU)JE3<9O`Y9!)75Ox}EW_#&4&iVx
zk*WsKLd%Aa^VHtUY9J7Z(-A~fQ5~P|_$I(?-}*+)>KE20X+_f}&g*q0TBboF;Q(UP
zdo8qq>gwu{33htR)}7+mC=;NXE{MriQ%ipua-zZs0JYBR9j2KWL^K*fPfw>z?YrFg
z?q{wWE)&(jL<2FM=VKQ9OVEtC8X7;o^v~yi0bW2xdNQy8ZvX%Q07*qoM6N<$f(viN
An*aa+

literal 0
HcmV?d00001

diff --git a/toolkit/themes/linux/global/jar.mn b/toolkit/themes/linux/global/jar.mn
index 5bde219fdd..c9b5791128 100644
--- a/toolkit/themes/linux/global/jar.mn
+++ b/toolkit/themes/linux/global/jar.mn
@@ -43,6 +43,7 @@ toolkit.jar:
    skin/classic/global/icons/blacklist_favicon.png             (icons/blacklist_favicon.png)
    skin/classic/global/icons/blacklist_large.png               (icons/blacklist_large.png)
    skin/classic/global/icons/close.svg                         (icons/close.svg)
+   skin/classic/global/icons/find.png                          (icons/find.png)
    skin/classic/global/icons/resizer.png                       (icons/resizer.png)
    skin/classic/global/icons/sslWarning.png                    (icons/sslWarning.png)
 
diff --git a/toolkit/themes/osx/global/findBar.css b/toolkit/themes/osx/global/findBar.css
index 4e775292f7..44983d80fa 100644
--- a/toolkit/themes/osx/global/findBar.css
+++ b/toolkit/themes/osx/global/findBar.css
@@ -9,6 +9,7 @@ findbar {
   background: @scopeBarBackground@;
   border-top: @scopeBarSeparatorBorder@;
   min-width: 1px;
+  padding: 4px 2px;
   transition-property: margin-bottom, opacity, visibility;
   transition-duration: 150ms, 150ms, 0s;
   transition-timing-function: ease-in-out, ease-in-out, linear;
@@ -23,27 +24,16 @@ findbar[hidden] {
   transition-delay: 0s, 0s, 150ms;
 }
 
-findbar[noanim] {
-  transition-duration: 0s !important;
-  transition-delay: 0s !important;
-}
-
 findbar:-moz-lwtheme {
   -moz-appearance: none;
   background: none;
   border-style: none;
 }
 
-.findbar-container {
-  padding-inline-start: 2px;
-  padding-top: 4px;
-  padding-bottom: 4px;
-}
-
 label.findbar-find-fast {
+  margin: 1px 3px 0 !important;
   color: @scopeBarTitleColor@;
-  margin: 0;
-  margin-inline-start: 12px;
+  font-weight: bold;
   text-shadow: @loweredShadow@;
 }
 
@@ -54,15 +44,20 @@ label.findbar-find-fast:-moz-lwtheme,
 }
 
 .findbar-closebutton {
-  margin-inline-start: 4px;
-  padding-inline-start: 0;
-  padding-inline-end: 8px;
+  padding: 0;
+  margin: 0 4px;
   border: none;
-  /* make sure the closebutton is displayed as the first element in the bar: */
-  -moz-box-ordinal-group: 0;
+}
+
+.findbar-closebutton:-moz-lwtheme-brighttext {
+  list-style-image: url("chrome://global/skin/icons/close-inverted.png");
 }
 
 @media (min-resolution: 2dppx) {
+  .findbar-closebutton:-moz-lwtheme-brighttext {
+    list-style-image: url("chrome://global/skin/icons/close-inverted@2x.png");
+  }
+  
   .findbar-closebutton > .toolbarbutton-icon {
     width: 16px;
   }
@@ -70,109 +65,124 @@ label.findbar-find-fast:-moz-lwtheme,
 
 .findbar-find-next,
 .findbar-find-previous,
-.findbar-highlight,
-.findbar-case-sensitive,
-.findbar-entire-word {
+.findbar-highlight {
+  margin: 0 4px;
+  padding: 1px 3px;
   -moz-appearance: none;
   border-radius: 10000px;
   border: @roundButtonBorder@;
   background: @roundButtonBackground@;
   box-shadow: @roundButtonShadow@;
   color: buttontext;
-  margin: 0;
 }
 
-@media (-moz-mac-yosemite-theme) {
-  .findbar-find-previous,
-  .findbar-find-next {
-    border-radius: 3px;
-    box-shadow: none;
-  }
-}
-
-.findbar-highlight,
-.findbar-case-sensitive,
-.findbar-entire-word {
-  margin-inline-end: 5px;
-  padding: 2px 9px;
-}
-
-.findbar-highlight {
-  margin-inline-start: 8px;
-}
-
-.findbar-container > toolbarbutton:-moz-focusring,
-.findbar-find-next:-moz-focusring,
-.findbar-find-previous:-moz-focusring {
+.findbar-container > toolbarbutton:-moz-focusring {
   position: relative;
   box-shadow: @focusRingShadow@, @roundButtonShadow@;
 }
 
+.findbar-container > toolbarbutton > .toolbarbutton-text {
+  margin: 0 6px !important;
+}
+
 .findbar-container > toolbarbutton[disabled] {
   color: GrayText !important;
 }
 
 .findbar-find-next:not([disabled]):hover:active,
 .findbar-find-previous:not([disabled]):hover:active,
-.findbar-highlight:not([disabled]):hover:active,
-.findbar-case-sensitive:not([disabled]):hover:active,
-.findbar-entire-word:not([disabled]):hover:active,
-.findbar-highlight:not([disabled])[checked="true"],
-.findbar-case-sensitive:not([disabled])[checked="true"],
-.findbar-entire-word:not([disabled])[checked="true"] {
+.findbar-highlight:not([disabled]):hover:active {
   text-shadow: @loweredShadow@;
   background: @roundButtonPressedBackground@;
   box-shadow: @roundButtonPressedShadow@;
 }
 
-.findbar-find-next:hover:active:-moz-focusring,
-.findbar-find-previous:hover:active:-moz-focusring {
+.findbar-container > toolbarbutton:hover:active:-moz-focusring {
   text-shadow: @loweredShadow@;
   background: @roundButtonPressedBackground@;
   box-shadow: @focusRingShadow@, @roundButtonPressedShadow@;
 }
 
-@media (-moz-mac-yosemite-theme) {
-  .findbar-container > toolbarbutton:-moz-focusring,
-  .findbar-find-next:-moz-focusring,
-  .findbar-find-previous:-moz-focusring {
-    box-shadow: @yosemiteFocusRingShadow@, @roundButtonShadow@;
+.findbar-closebutton > .toolbarbutton-text {
+  display: none;  
+}
+
+/* Match case checkbox */
+
+.findbar-container > checkbox {
+  list-style-image: url("chrome://global/skin/icons/checkbox.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
+  -moz-appearance: none;
+  margin: 0 2px;
+  -moz-margin-start: 7px;
+}
+
+.findbar-container > checkbox:hover:active {
+  -moz-image-region: rect(0px 32px 16px 16px);
+}
+.findbar-container > checkbox[checked] {
+  -moz-image-region: rect(0px 48px 16px 32px);
+}
+.findbar-container > checkbox[checked]:hover:active {
+  -moz-image-region: rect(0px 64px 16px 48px);
+}
+
+@media (min-resolution: 2dppx) {
+  .findbar-container > checkbox {
+    list-style-image: url("chrome://global/skin/icons/checkbox@2x.png");
+    -moz-image-region: rect(0px 32px 32px 0px);
   }
 
-  .findbar-find-next:hover:active:-moz-focusring,
-  .findbar-find-previous:hover:active:-moz-focusring {
-    box-shadow: @yosemiteFocusRingShadow@, @roundButtonPressedShadow@;
+  .findbar-container > checkbox:hover:active {
+    -moz-image-region: rect(0px 64px 32px 32px);
   }
+  .findbar-container > checkbox[checked] {
+    -moz-image-region: rect(0px 96px 32px 64px);
+  }
+  .findbar-container > checkbox[checked]:hover:active {
+    -moz-image-region: rect(0px 128px 32px 96px);
+  }
+}
+
+
+
+.findbar-container > checkbox > .checkbox-check {
+  display: none;
+}
+
+.findbar-container > checkbox > .checkbox-label-box > .checkbox-label {
+  margin: 0 !important;
+  padding: 2px 0 0;
+}
+
+.findbar-container > checkbox > .checkbox-label-box > .checkbox-icon {
+  -moz-padding-start: 1px;
+  padding-bottom: 1px;
+}
+@media (min-resolution: 2dppx) {
+  .findbar-container > checkbox > .checkbox-label-box > .checkbox-icon {
+    width: 17px;
+    height: 17px;
+  }
+}
+
+.findbar-container > checkbox:-moz-focusring > .checkbox-label-box > .checkbox-icon {
+  border-radius: 4px;
+  box-shadow: @focusRingShadow@;
 }
 
 /* Search field */
 
 .findbar-textbox {
-  position: relative;
   -moz-appearance: none;
-  border: @roundButtonBorder@;
-  border-radius: 10000px 0 0 10000px;
-  box-shadow: @roundButtonShadow@;
-  background: url("chrome://global/skin/icons/search-textbox.svg") -moz-Field no-repeat 5px center;
-  margin: 0;
-  padding: 2px 8px;
-  padding-inline-start: 19px;
-}
-
-.findbar-textbox:-moz-locale-dir(rtl) {
-  border-radius: 0 10000px 10000px 0;
-}
-
-@media (-moz-mac-yosemite-theme) {
-  .findbar-textbox {
-    border-top-left-radius: 3px;
-    border-bottom-left-radius: 3px;
-    box-shadow: none;
-  }
-
-  .findbar-textbox:-moz-locale-dir(rtl) {
-    border-radius: 0 3px 3px 0;
-  }
+  border-radius: 10000px;
+  border: none;
+  box-shadow: 0 1px 1.5px rgba(0, 0, 0, .7) inset,
+              0 0 0 1px rgba(0, 0, 0, .17) inset;
+  background: url("chrome://global/skin/icons/search-textbox.png") -moz-Field no-repeat 5px center;
+  margin: 0 4px -1px;
+  padding: 3px 8px 2px;
+  -moz-padding-start: 19px;
 }
 
 .findbar-textbox:not([focused="true"]):-moz-lwtheme {
@@ -180,13 +190,8 @@ label.findbar-find-fast:-moz-lwtheme,
 }
 
 .findbar-textbox[focused="true"] {
-  box-shadow: @focusRingShadow@;
-}
-
-@media (-moz-mac-yosemite-theme) {
-  .findbar-textbox[focused="true"] {
-    box-shadow: @yosemiteFocusRingShadow@;
-  }
+  box-shadow: @focusRingShadow@,
+              0 1px 1.5px rgba(0, 0, 0, .8) inset;
 }
 
 .findbar-textbox[flash="true"] {
@@ -198,48 +203,52 @@ label.findbar-find-fast:-moz-lwtheme,
   color: #FFF;
 }
 
-.findbar-textbox.minimal {
-  border-radius: 10000px;
-  margin-inline-start: 5px;
-}
+/* find-next button */
 
-/* Find previous/next buttons */
-
-.findbar-find-previous,
 .findbar-find-next {
-  margin-inline-start: 0;
-  padding: 3px 6px 1px;
+  -moz-border-end: none;
+  -moz-margin-end: 0 !important;
 }
 
-.findbar-find-previous > .toolbarbutton-icon,
-.findbar-find-next > .toolbarbutton-icon {
-  margin: 0;
+.findbar-find-next:-moz-locale-dir(ltr),
+.findbar-find-previous:-moz-locale-dir(rtl) {
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
 }
 
+/* find-previous button */
+
 .findbar-find-previous {
-  border-left: none;
-  border-right: none;
-  margin-inline-end: 0;
-  list-style-image: url(chrome://global/skin/icons/find-arrows.svg#glyph-find-previous);
-  border-radius: 0;
-}
-
-.findbar-find-next {
-  list-style-image: url(chrome://global/skin/icons/find-arrows.svg#glyph-find-next);
-  padding-inline-end: 7px;
-}
-
-.findbar-find-next:-moz-locale-dir(ltr) {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
+  -moz-margin-start: 0 !important;
 }
 
+.findbar-find-previous:-moz-locale-dir(ltr),
 .findbar-find-next:-moz-locale-dir(rtl) {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
 }
 
-/* Status description */
+/* highlight button */
+
+.findbar-highlight {
+  -moz-margin-start: 8px;
+}
+
+.findbar-highlight > .toolbarbutton-icon {
+  width: 13px;
+  height: 8px;
+  margin: 0 4px;
+  -moz-margin-end: 0;
+  border: 1px solid #818181;
+  border-radius: 4px;
+  background-color: #F4F4F3;
+}
+
+
+.findbar-highlight[checked="true"] > .toolbarbutton-icon {
+  background-color: #FFFF00;
+  border-color: #818100;
+}
 
 .find-status-icon {
   display: none;
@@ -247,20 +256,14 @@ label.findbar-find-fast:-moz-lwtheme,
 
 .find-status-icon[status="pending"] {
   display: block;
-  list-style-image: url("chrome://global/skin/icons/loading.png");
-}
-
-@media (min-resolution: 2dppx) {
-  .find-status-icon[status="pending"] {
-    width: 16px;
-    list-style-image: url("chrome://global/skin/icons/loading@2x.png");
-  }
+  list-style-image: url("chrome://global/skin/icons/loading_16.png");
 }
 
 .findbar-find-status,
 .found-matches {
-  color: rgba(0,0,0,.5);
-  margin: 0 !important;
-  margin-inline-start: 12px !important;
-  text-shadow: 0 1px rgba(255,255,255,.4);
+  color: #436599;
+  font-weight: bold;
+  text-shadow: 0 1px rgba(255, 255, 255, .4);
+  margin: 1px 1px 0 !important;
+  -moz-margin-start: 12px !important;
 }
diff --git a/toolkit/themes/windows/global/findBar.css b/toolkit/themes/windows/global/findBar.css
index 96115f1938..34b3ae49b8 100644
--- a/toolkit/themes/windows/global/findBar.css
+++ b/toolkit/themes/windows/global/findBar.css
@@ -4,8 +4,18 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
+.findbar-closebutton {
+  border: none;
+  padding: 3px 5px;
+  -moz-appearance: none;
+}
+
+.findbar-closebutton:-moz-lwtheme-brighttext {
+  list-style-image: url("chrome://global/skin/icons/close-inverted.png");
+}
+
 findbar {
-  box-shadow: 0 1px 1px rgba(0,0,0,.1) inset;
+  padding-top: 1px;
   background-image: linear-gradient(rgba(0,0,0,.15) 1px, rgba(255,255,255,.15) 1px);
   background-size: 100% 2px;
   background-repeat: no-repeat;
@@ -24,137 +34,94 @@ findbar[hidden] {
   transition-delay: 0s, 0s, 150ms;
 }
 
-findbar[noanim] {
-  transition-duration: 0s !important;
-  transition-delay: 0s !important;
-}
+/* find-next button */
 
-.findbar-container {
-  padding-inline-start: 8px;
-  padding-top: 4px;
-  padding-bottom: 4px;
-}
-
-.findbar-closebutton {
-  margin-inline-start: 4px;
-  padding-inline-start: 0;
-  padding-inline-end: 8px;
-  border: none;
-  -moz-appearance: none;
-}
-
-
-/* Search field */
-
-.findbar-textbox {
-  -moz-appearance: none;
-  border: 1px solid ThreeDShadow;
-  border-radius: 2px 0 0 2px;
-  margin: 0;
-  padding: 1px 5px;
-  width: 14em;
-}
-
-.findbar-textbox:-moz-locale-dir(rtl) {
-  border-radius: 0 2px 2px 0;
-}
-
-.findbar-textbox[focused="true"] {
-  border-color: Highlight;
-}
-
-.findbar-textbox[status="notfound"] {
-  background-color: #f66;
-  color: white;
-}
-
-.findbar-textbox[flash="true"] {
-  background-color: yellow;
-  color: black;
-}
-
-.findbar-textbox.minimal {
-  border-radius: 2px;
-}
-
-/* Buttons */
-
-.findbar-find-previous,
 .findbar-find-next {
-  margin-inline-start: 0;
-  -moz-appearance: none;
-  background: linear-gradient(rgba(255,255,255,.8) 1px, rgba(255,255,255,.4) 1px, rgba(255,255,255,.1));
-  border: 1px solid ThreeDShadow;
-  padding: 1px 5px;
-  line-height: 1em;
+  list-style-image: url("chrome://global/skin/icons/find.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
 }
 
-.findbar-find-previous:not([disabled]):active,
-.findbar-find-next:not([disabled]):active {
-  background: rgba(23,50,76,.2);
-  box-shadow: 0 1px 2px rgba(10,31,51,.2) inset;
+.findbar-find-next:hover {
+  -moz-image-region: rect(16px 16px 32px 0px);
 }
 
+.findbar-find-next[disabled="true"] {
+  -moz-image-region: rect(32px 16px 48px 0px) !important;
+}
+
+/* find-previous button */
+
 .findbar-find-previous {
-  list-style-image: url(chrome://global/skin/icons/find-arrows.svg#glyph-find-previous);
+  list-style-image: url("chrome://global/skin/icons/find.png");
+  -moz-image-region: rect(0px 32px 16px 16px);
 }
 
-.findbar-find-next {
-  list-style-image: url(chrome://global/skin/icons/find-arrows.svg#glyph-find-next);
+.findbar-find-previous:hover {
+  -moz-image-region: rect(16px 32px 32px 16px);
 }
 
-.findbar-find-previous,
-.findbar-find-previous:not([disabled]):active {
-  border-right: none;
-  border-left: none;
+.findbar-find-previous[disabled="true"] {
+  -moz-image-region: rect(32px 32px 48px 16px) !important;
 }
 
-.findbar-find-previous > .toolbarbutton-icon,
-.findbar-find-next > .toolbarbutton-icon {
-  margin: 0;
+/* highlight button */
+
+.findbar-highlight {
+  list-style-image: url("chrome://global/skin/icons/find.png");
+  -moz-image-region: rect(0px 48px 16px 32px);
 }
 
-.findbar-find-previous[disabled="true"] > .toolbarbutton-icon,
-.findbar-find-next[disabled="true"] > .toolbarbutton-icon {
-  opacity: .5;
+.findbar-highlight:hover {
+  -moz-image-region: rect(16px 48px 32px 32px);
 }
 
-.findbar-find-next:-moz-locale-dir(ltr) {
-  border-top-right-radius: 2px;
-  border-bottom-right-radius: 2px;
+.findbar-highlight[disabled="true"] {
+  -moz-image-region: rect(32px 48px 48px 32px) !important;
 }
 
-.findbar-find-next:-moz-locale-dir(rtl) {
-  border-top-left-radius: 2px;
-  border-bottom-left-radius: 2px;
+.findbar-highlight:active, .findbar-highlight[checked="true"] {
+  -moz-image-region: rect(48px 48px 64px 32px);
 }
 
-.findbar-highlight,
-.findbar-case-sensitive,
-.findbar-entire-word {
-  margin-inline-start: 5px;
+.findbar-highlight[checked="true"]:hover {
+  -moz-image-region: rect(64px 48px 80px 32px);
 }
 
-.findbar-highlight > .toolbarbutton-icon,
-.findbar-case-sensitive > .toolbarbutton-icon,
-.findbar-entire-word > .toolbarbutton-icon {
-  display: none;
+.find-status-icon {
+  list-style-image: none;
+  margin-top: 2px;
+  margin-bottom: 0px;
+  -moz-margin-start: 12px;
+  -moz-margin-end: 0px;
+  width: 16px;
+  height: 16px;
 }
 
 .findbar-find-status,
 .found-matches {
-  color: GrayText;
   margin: 0 !important;
-  margin-inline-start: 12px !important;
+  -moz-margin-start: 3px !important;
+  padding: 2px !important;
+}
+
+.find-status-icon[status="notfound"] {
+  list-style-image: url("chrome://global/skin/icons/information-16.png");
+}
+
+.findbar-textbox[status="notfound"] {
+  box-shadow: 0 0 0 1em #f66 inset;
+  color: white;
+}
+
+.findbar-textbox[flash="true"] {
+  box-shadow: 0 0 0 1em yellow inset;
+  color: black;
+}
+
+.find-status-icon[status="wrapped"] {
+  list-style-image: url("chrome://global/skin/icons/wrap.png");
 }
 
 .find-status-icon[status="pending"] {
-  list-style-image: url("chrome://global/skin/icons/loading.png");
-}
-
-@media (min-resolution: 1.1dppx) {
-  .find-status-icon[status="pending"] {
-    width: 16px;
-    list-style-image: url("chrome://global/skin/icons/loading@2x.png");
-  }
+  list-style-image: url("chrome://global/skin/icons/loading_16.png");
 }
diff --git a/toolkit/themes/windows/global/icons/find.png b/toolkit/themes/windows/global/icons/find.png
new file mode 100644
index 0000000000000000000000000000000000000000..60d6da97ec3dd125718a026815eda550a7878ebb
GIT binary patch
literal 1736
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

literal 0
HcmV?d00001

diff --git a/toolkit/themes/windows/global/jar.mn b/toolkit/themes/windows/global/jar.mn
index 7f07710204..904e971b59 100644
--- a/toolkit/themes/windows/global/jar.mn
+++ b/toolkit/themes/windows/global/jar.mn
@@ -48,6 +48,7 @@ toolkit.jar:
   skin/classic/global/icons/close-XPVista7@2x.png          (icons/close-XPVista7@2x.png)
   skin/classic/global/icons/close-inverted-XPVista7.png    (icons/close-inverted-XPVista7.png)
   skin/classic/global/icons/close-inverted-XPVista7@2x.png (icons/close-inverted-XPVista7@2x.png)
+  skin/classic/global/icons/find.png                       (icons/find.png)
   skin/classic/global/icons/resizer.png                    (icons/resizer.png)
   skin/classic/global/icons/sslWarning.png                 (icons/sslWarning.png)
 * skin/classic/global/in-content/common.css                (in-content/common.css)