From 26d381173120b82093a0b73d0f4895f8e2fd958c Mon Sep 17 00:00:00 2001 From: Tim Nguyen Date: Tue, 23 Dec 2014 13:55:00 -0500 Subject: [PATCH] Bug 1113173 - InContent Prefs - Fix invisible checkmark and black text on selected row. r=jaws --- browser/themes/linux/jar.mn | 2 -- browser/themes/osx/jar.mn | 2 -- .../themes/shared/incontentprefs/check.png | Bin 288 -> 0 bytes .../themes/shared/incontentprefs/check@2x.png | Bin 471 -> 0 bytes .../themes/shared/incontentprefs/search.css | 19 +++++------------- browser/themes/windows/jar.mn | 4 ---- toolkit/themes/shared/in-content/check.svg | 17 +++++++++++++--- 7 files changed, 19 insertions(+), 25 deletions(-) delete mode 100644 browser/themes/shared/incontentprefs/check.png delete mode 100644 browser/themes/shared/incontentprefs/check@2x.png diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn index e5247db1de2..66ea1dd17af 100644 --- a/browser/themes/linux/jar.mn +++ b/browser/themes/linux/jar.mn @@ -170,8 +170,6 @@ browser.jar: skin/classic/browser/preferences/in-content/icons.png (../shared/incontentprefs/icons.png) skin/classic/browser/preferences/in-content/icons@2x.png (../shared/incontentprefs/icons@2x.png) skin/classic/browser/preferences/in-content/search.css (../shared/incontentprefs/search.css) - skin/classic/browser/preferences/in-content/check.png (../shared/incontentprefs/check.png) - skin/classic/browser/preferences/in-content/check@2x.png (../shared/incontentprefs/check@2x.png) skin/classic/browser/preferences/applications.css (preferences/applications.css) skin/classic/browser/preferences/aboutPermissions.css (preferences/aboutPermissions.css) skin/classic/browser/preferences/search.css (preferences/search.css) diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn index adaeca9e9a7..b1106dd9b6c 100644 --- a/browser/themes/osx/jar.mn +++ b/browser/themes/osx/jar.mn @@ -275,8 +275,6 @@ browser.jar: skin/classic/browser/preferences/in-content/icons.png (../shared/incontentprefs/icons.png) skin/classic/browser/preferences/in-content/icons@2x.png (../shared/incontentprefs/icons@2x.png) skin/classic/browser/preferences/in-content/search.css (../shared/incontentprefs/search.css) - skin/classic/browser/preferences/in-content/check.png (../shared/incontentprefs/check.png) - skin/classic/browser/preferences/in-content/check@2x.png (../shared/incontentprefs/check@2x.png) skin/classic/browser/preferences/applications.css (preferences/applications.css) skin/classic/browser/preferences/aboutPermissions.css (preferences/aboutPermissions.css) skin/classic/browser/preferences/search.css (preferences/search.css) diff --git a/browser/themes/shared/incontentprefs/check.png b/browser/themes/shared/incontentprefs/check.png deleted file mode 100644 index 98c89d66e628dcf852fbe1774363c0efff8876ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 288 zcmV+*0pI?KP)uK>R~t@+A$tisk#y zNCFkU18bOkp#m0%^Q@h`;* zm-P^)OuWzpmH4kb@q9ek-P13M0S$Nq6>mhfchxFprHL1IK_!1HOupc*H0k_mDF3o{ z!&Np6x5`bsBnVV=2dd~Nl>VbM;k+r%5K)ZA*GKo8sEk_P~vZGl;O!Zy1A0000KH!tvMkWBPiTfeQkisuk6NzZf$nnB~x9RygrOJ7L4mM`NU#$rqO6PQw!~Oh?slF%zdRCtMZ>`t%K&1+Ub4&WK>w zF!4edmNfhamv@1VS%VR=Kr;yC!cAB#`KB=Gq6La$CZ7+*5;W@wMi?kl02N=yV##Y* zp#=&8P*9-Bzf+icRf4!QJ>`NLP{RjIOU~a>o_7ooJ<;zNZ7AQ_SpGr|NAT{$07to*!I4syhm9j>m|GWY? z6`>mb1td<*I@S?r=x;>OT*#q*MLy|b9@K(E#1@34r>sfmr;*!A005yCz>!?D9tr>e N002ovPDHLkV1jR)%n1Mh diff --git a/browser/themes/shared/incontentprefs/search.css b/browser/themes/shared/incontentprefs/search.css index dae04fbdecc..ebcd82ec8d9 100644 --- a/browser/themes/shared/incontentprefs/search.css +++ b/browser/themes/shared/incontentprefs/search.css @@ -16,17 +16,13 @@ } #engineList treechildren::-moz-tree-image(engineShown, checked) { - /* Unfortunately check.svg can't be used in XUL trees. */ - list-style-image: url("check.png"); - -moz-margin-start: 5px; - width: 12px; - height: 12px; + list-style-image: url("chrome://global/skin/in-content/check.svg#check"); + width: 21px; + height: 21px; } -@media (min-resolution: 2dppx) { - #engineList treechildren::-moz-tree-image(engineShown, checked) { - list-style-image: url("check@2x.png"); - } +#engineList treechildren::-moz-tree-image(engineShown, checked, selected) { + list-style-image: url("chrome://global/skin/in-content/check.svg#check-inverted"); } #engineList treechildren::-moz-tree-image(engineName) { @@ -40,11 +36,6 @@ min-height: 36px; } -#engineList treechildren::-moz-tree-cell-text { - /* Override to avoid text in the selected row being white on light gray. */ - color: -moz-FieldText; -} - #engineList treechildren::-moz-tree-drop-feedback { background-color: Highlight; width: 10000px; /* 100% doesn't work; 10k is hopefully larger than any window diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn index 0040fb14e4b..4ec17e8c985 100644 --- a/browser/themes/windows/jar.mn +++ b/browser/themes/windows/jar.mn @@ -198,8 +198,6 @@ browser.jar: skin/classic/browser/preferences/in-content/icons.png (../shared/incontentprefs/icons.png) skin/classic/browser/preferences/in-content/icons@2x.png (../shared/incontentprefs/icons@2x.png) skin/classic/browser/preferences/in-content/search.css (../shared/incontentprefs/search.css) - skin/classic/browser/preferences/in-content/check.png (../shared/incontentprefs/check.png) - skin/classic/browser/preferences/in-content/check@2x.png (../shared/incontentprefs/check@2x.png) skin/classic/browser/preferences/applications.css (preferences/applications.css) skin/classic/browser/preferences/aboutPermissions.css (preferences/aboutPermissions.css) skin/classic/browser/preferences/search.css (preferences/search.css) @@ -655,8 +653,6 @@ browser.jar: skin/classic/aero/browser/preferences/in-content/icons.png (../shared/incontentprefs/icons.png) skin/classic/aero/browser/preferences/in-content/icons@2x.png (../shared/incontentprefs/icons@2x.png) skin/classic/aero/browser/preferences/in-content/search.css (../shared/incontentprefs/search.css) - skin/classic/aero/browser/preferences/in-content/check.png (../shared/incontentprefs/check.png) - skin/classic/aero/browser/preferences/in-content/check@2x.png (../shared/incontentprefs/check@2x.png) skin/classic/aero/browser/preferences/applications.css (preferences/applications.css) skin/classic/aero/browser/preferences/aboutPermissions.css (preferences/aboutPermissions.css) skin/classic/aero/browser/preferences/search.css (preferences/search.css) diff --git a/toolkit/themes/shared/in-content/check.svg b/toolkit/themes/shared/in-content/check.svg index f759c0a4572..9fb2223e22a 100644 --- a/toolkit/themes/shared/in-content/check.svg +++ b/toolkit/themes/shared/in-content/check.svg @@ -1,6 +1,11 @@ - + + \ No newline at end of file