From b0d13585bf7708c8605ce7d5d9a12a83e1167dc5 Mon Sep 17 00:00:00 2001 From: Phil Ringnalda Date: Fri, 15 Mar 2013 19:59:09 -0700 Subject: [PATCH] Back out 6690c6da6cc6 (bug 848150) for test bustage CLOSED TREE --- browser/base/content/abouthome/aboutHome.xhtml | 2 +- browser/branding/aurora/content/jar.mn | 1 - browser/branding/nightly/content/jar.mn | 1 - browser/branding/official/content/jar.mn | 1 - browser/branding/unofficial/content/jar.mn | 1 - browser/locales/en-US/searchplugins/google.xml | 2 +- browser/themes/osx/searchbar.css | 5 ----- 7 files changed, 2 insertions(+), 11 deletions(-) diff --git a/browser/base/content/abouthome/aboutHome.xhtml b/browser/base/content/abouthome/aboutHome.xhtml index 3a2d6546657..1cb8b6d1802 100644 --- a/browser/base/content/abouthome/aboutHome.xhtml +++ b/browser/base/content/abouthome/aboutHome.xhtml @@ -22,7 +22,7 @@ &abouthome.pageTitle; + href="chrome://branding/content/icon16.png"/> diff --git a/browser/branding/aurora/content/jar.mn b/browser/branding/aurora/content/jar.mn index abe651b98c8..310063280bd 100644 --- a/browser/branding/aurora/content/jar.mn +++ b/browser/branding/aurora/content/jar.mn @@ -11,5 +11,4 @@ browser.jar: content/branding/icon48.png (icon48.png) content/branding/icon64.png (icon64.png) content/branding/icon16.png (../default16.png) - content/branding/icon32.png (../default32.png) content/branding/aboutDialog.css (aboutDialog.css) diff --git a/browser/branding/nightly/content/jar.mn b/browser/branding/nightly/content/jar.mn index abe651b98c8..310063280bd 100644 --- a/browser/branding/nightly/content/jar.mn +++ b/browser/branding/nightly/content/jar.mn @@ -11,5 +11,4 @@ browser.jar: content/branding/icon48.png (icon48.png) content/branding/icon64.png (icon64.png) content/branding/icon16.png (../default16.png) - content/branding/icon32.png (../default32.png) content/branding/aboutDialog.css (aboutDialog.css) diff --git a/browser/branding/official/content/jar.mn b/browser/branding/official/content/jar.mn index 5794ae2e76d..8e99c940e53 100644 --- a/browser/branding/official/content/jar.mn +++ b/browser/branding/official/content/jar.mn @@ -10,5 +10,4 @@ browser.jar: content/branding/icon48.png (icon48.png) content/branding/icon64.png (icon64.png) content/branding/icon16.png (../default16.png) - content/branding/icon32.png (../default32.png) content/branding/aboutDialog.css (aboutDialog.css) diff --git a/browser/branding/unofficial/content/jar.mn b/browser/branding/unofficial/content/jar.mn index abe651b98c8..310063280bd 100644 --- a/browser/branding/unofficial/content/jar.mn +++ b/browser/branding/unofficial/content/jar.mn @@ -11,5 +11,4 @@ browser.jar: content/branding/icon48.png (icon48.png) content/branding/icon64.png (icon64.png) content/branding/icon16.png (../default16.png) - content/branding/icon32.png (../default32.png) content/branding/aboutDialog.css (aboutDialog.css) diff --git a/browser/locales/en-US/searchplugins/google.xml b/browser/locales/en-US/searchplugins/google.xml index 368ffcb241b..9f9695870f6 100644 --- a/browser/locales/en-US/searchplugins/google.xml +++ b/browser/locales/en-US/searchplugins/google.xml @@ -6,7 +6,7 @@ Google Google Search UTF-8 -data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAC0klEQVRYw8VX60sUURSffybqP+hDXzaXjF5UQm+C6ksERQ+iIIiiZXXTsqeVQmUWSVSkJlGUgQXWh8welqFWipala9o4dx47j9M5d5xxXXbbWXdm98BlWfbu/f3Ouef8zrmCgLYwMjpvcVS8XxIR/5ZEJQh0IQZhESZhC4si4vxQRJwIHDhlESZhC9zzAoM7i7CFgoQ9cxSmhLn8cXe9DC2dOvT/NkFSLUhnA2MmHG5Usp6VE4FVpxi0dev88IO3FVh9msHeBgW+/DQ5qG4AxFpU2FLDYEmFtzM9E6AD3w0aoOoA68+zWb8tr5Tg26hNQlQs2HCBeXbKM4HqRyoHePvdSPv7/puKG/7mzoT/BD4N2x4+wyvItGcwbu8ZEy3/CSgJ+G8EaDW9sTfJWoAEGGb90lj6PXXPNb5naNz0nwB57lhFs5p2T8NLm+X1ds1/AkfuzCQZ3fHaM7MzvRSr5CvqAuXKspOS/wRo1b/QXBJUdodQC9ZUM9h5VYZXfQa87jdgZRXLSdRyVsI9NxR4/F7n3vb9MsGcFsKeHyaUxnJXVSEfLd98kbkRaexIzOmMvAhsSiIwLlmwo04uLAFadO+OUf2feKAGRyBcLsGuazJceqrxbtjRa/CaTzYrqDIsx9ofmbSAoZekeMfuqbC9VoayswzKsCRJ/5Ottk3zj4AjsZ8x01M7YSpJffpG6HPdOZY/gaN3bQEyMNIbPbTZyoeqG4Vok5o/gfYenR9Gnc7rddFVkdFwkjcBpw3/wTILeyTgTEheyjIrgdYu3Q1pVWt2jygpE3j/3UOGP0m49bLstmLdtLM7k+TSjNg1YMAEs3iF+FYFB24pEJ+amX4nEeDJB52ToVGtBnWBvtOE/BE933ZF9l8HVmCXIzDqetSOaTilUqPc6B0xuQ7sw7kwnLMUF/thUvSnWeh4fEGxHqeE7b6QiU0oKoqBAyMGYfGXMdo//lt3GYGEQycAAAAASUVORK5CYII= +data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABUUlEQVR42pWTzUsCYRCH9y9zu3SooCCkjhIRRLeIykXokiWCJ7PvDpZRlz6si1lIQZ3SQxQdOhREpgSm0JeQvfu0+i6I7LKLh4F5h5nnnRl+o6jTdHn8omAYbVqhXqvYFXcEBKFDwcoZZB8B4LkEB9cwGGmFKHb01A1EU9JXzfdvDYZi1lwLwBcVAIwsNWPesIwls7gDtB2Z7N9ujVe+IX2LO2AgItB1OL9vJqsmILDrOoK02IkBAdYy4FsQJC5h+VQCHQDWTqYSgo8fuHuRxS4Ae3stQ7UGE5ttAHqCUgfxC7m4ryrowOyeO6CxqHwZxtYFqtYc5+kNan/gDTsAeueEIRj7n/rmRQMwueUAGF0VAAT3rQBTC0Y3DoDOGbm00icML4oWHYSTgo0MFqjlmPpDgqMcFCuQf4erBzjOwXjcriu9qHg0uutO2+es6fl67T9ptebvFRjBVgAAAABJRU5ErkJggg== diff --git a/browser/themes/osx/searchbar.css b/browser/themes/osx/searchbar.css index d79ff9fc749..50343915f6b 100644 --- a/browser/themes/osx/searchbar.css +++ b/browser/themes/osx/searchbar.css @@ -48,11 +48,6 @@ } @media (min-resolution: 2dppx) { - .searchbar-engine-image, - .searchbar-engine-menuitem > .menu-iconic-left > .menu-iconic-icon { - image-rendering: -moz-crisp-edges; - } - .searchbar-engine-image { list-style-image: url("chrome://mozapps/skin/places/defaultFavicon@2x.png"); }