From 360dec1b8b73fb59664fff5e660453bba56e09ed Mon Sep 17 00:00:00 2001 From: Mike de Boer Date: Tue, 17 May 2016 23:27:35 +0200 Subject: [PATCH] Bug 1271680 - use scalable SVG icons for the findbar navigation arrows on Windows and Linux too. r=dao --HG-- rename : toolkit/themes/osx/global/icons/find-arrows.svg => toolkit/themes/shared/icons/find-arrows.svg --- toolkit/themes/linux/global/findBar.css | 5 ++--- toolkit/themes/osx/global/jar.mn | 1 - toolkit/themes/{osx/global => shared}/icons/find-arrows.svg | 2 +- toolkit/themes/shared/jar.inc.mn | 1 + toolkit/themes/shared/non-mac.jar.inc.mn | 1 - toolkit/themes/windows/global/findBar.css | 5 ++--- 6 files changed, 6 insertions(+), 9 deletions(-) rename toolkit/themes/{osx/global => shared}/icons/find-arrows.svg (95%) diff --git a/toolkit/themes/linux/global/findBar.css b/toolkit/themes/linux/global/findBar.css index b98d5c54dc0d..44aa43b83b1b 100644 --- a/toolkit/themes/linux/global/findBar.css +++ b/toolkit/themes/linux/global/findBar.css @@ -88,7 +88,6 @@ findbar[noanim] { background: linear-gradient(rgba(255,255,255,.9), rgba(255,255,255,.2)); border: 1px solid ThreeDShadow; box-shadow: 0 1px #fff inset; - list-style-image: url("chrome://global/skin/icons/find-arrows.png"); padding: 5px 9px; line-height: 1em; } @@ -107,12 +106,12 @@ findbar[noanim] { } .findbar-find-previous { - -moz-image-region: rect(0, 12px, 9px, 0); + list-style-image: url(chrome://global/skin/icons/find-arrows.svg#glyph-find-previous); border-inline-end-width: 0; } .findbar-find-next { - -moz-image-region: rect(0, 24px, 9px, 12px); + list-style-image: url(chrome://global/skin/icons/find-arrows.svg#glyph-find-next); } .findbar-find-previous > .toolbarbutton-icon, diff --git a/toolkit/themes/osx/global/jar.mn b/toolkit/themes/osx/global/jar.mn index 1cfb5f5043bb..e45edd9367c6 100644 --- a/toolkit/themes/osx/global/jar.mn +++ b/toolkit/themes/osx/global/jar.mn @@ -94,7 +94,6 @@ toolkit.jar: skin/classic/global/icons/checkbox@2x.png (icons/checkbox@2x.png) skin/classic/global/icons/close.png (icons/close.png) skin/classic/global/icons/close@2x.png (icons/close@2x.png) - skin/classic/global/icons/find-arrows.svg (icons/find-arrows.svg) skin/classic/global/icons/glyph-dropdown.png (icons/glyph-dropdown.png) skin/classic/global/icons/glyph-dropdown@2x.png (icons/glyph-dropdown@2x.png) skin/classic/global/icons/information-16.png (icons/information-16.png) diff --git a/toolkit/themes/osx/global/icons/find-arrows.svg b/toolkit/themes/shared/icons/find-arrows.svg similarity index 95% rename from toolkit/themes/osx/global/icons/find-arrows.svg rename to toolkit/themes/shared/icons/find-arrows.svg index 5291e2f6e0ea..608c0a7dbd8c 100644 --- a/toolkit/themes/osx/global/icons/find-arrows.svg +++ b/toolkit/themes/shared/icons/find-arrows.svg @@ -8,7 +8,7 @@ display: none; } path { - fill: #4c4c4c; + fill: -moz-dialogtext; } diff --git a/toolkit/themes/shared/jar.inc.mn b/toolkit/themes/shared/jar.inc.mn index 8307407d8f27..4a6e6b4fb7df 100644 --- a/toolkit/themes/shared/jar.inc.mn +++ b/toolkit/themes/shared/jar.inc.mn @@ -21,6 +21,7 @@ toolkit.jar: skin/classic/global/aboutSupport.css (../../shared/aboutSupport.css) skin/classic/global/appPicker.css (../../shared/appPicker.css) skin/classic/global/config.css (../../shared/config.css) + skin/classic/global/icons/find-arrows.svg (../../shared/icons/find-arrows.svg) skin/classic/global/icons/info.svg (../../shared/incontent-icons/info.svg) skin/classic/global/icons/loading-inverted.png (../../shared/icons/loading-inverted.png) skin/classic/global/icons/loading-inverted@2x.png (../../shared/icons/loading-inverted@2x.png) diff --git a/toolkit/themes/shared/non-mac.jar.inc.mn b/toolkit/themes/shared/non-mac.jar.inc.mn index 775c44188d03..10a01283ffa6 100644 --- a/toolkit/themes/shared/non-mac.jar.inc.mn +++ b/toolkit/themes/shared/non-mac.jar.inc.mn @@ -70,7 +70,6 @@ skin/classic/global/icons/error-16.png (../../windows/global/icons/error-16.png) skin/classic/global/icons/error-64.png (../../windows/global/icons/error-64.png) skin/classic/global/icons/expand.png (../../windows/global/icons/expand.png) - skin/classic/global/icons/find-arrows.png (../../windows/global/icons/find-arrows.png) skin/classic/global/icons/folder-item.png (../../windows/global/icons/folder-item.png) skin/classic/global/icons/information-16.png (../../windows/global/icons/information-16.png) skin/classic/global/icons/information-24.png (../../windows/global/icons/information-24.png) diff --git a/toolkit/themes/windows/global/findBar.css b/toolkit/themes/windows/global/findBar.css index 773a04908c69..9b5a8606e91a 100644 --- a/toolkit/themes/windows/global/findBar.css +++ b/toolkit/themes/windows/global/findBar.css @@ -86,7 +86,6 @@ findbar[noanim] { background: linear-gradient(rgba(255,255,255,.9), rgba(255,255,255,.2)); border: 1px solid ThreeDShadow; box-shadow: 0 1px #fff inset; - list-style-image: url("chrome://global/skin/icons/find-arrows.png"); padding: 1px 5px; line-height: 1em; } @@ -98,11 +97,11 @@ findbar[noanim] { } .findbar-find-previous { - -moz-image-region: rect(0, 12px, 9px, 0); + list-style-image: url(chrome://global/skin/icons/find-arrows.svg#glyph-find-previous); } .findbar-find-next { - -moz-image-region: rect(0, 24px, 9px, 12px); + list-style-image: url(chrome://global/skin/icons/find-arrows.svg#glyph-find-next); } .findbar-find-previous,