From b898f5145596edaffd07d120c17db8ee7a3037a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A3o=20Gottwald?= Date: Mon, 14 Jun 2010 17:06:43 +0200 Subject: [PATCH] Backed out changeset 3a711e98c1ed --- browser/base/content/test/browser_relatedTabs.js | 8 +++----- toolkit/themes/gnomestripe/global/tree.css | 9 ++++----- toolkit/themes/pinstripe/global/tree.css | 8 ++++---- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/browser/base/content/test/browser_relatedTabs.js b/browser/base/content/test/browser_relatedTabs.js index 991724abd99d..cec7b2fbd176 100644 --- a/browser/base/content/test/browser_relatedTabs.js +++ b/browser/base/content/test/browser_relatedTabs.js @@ -36,8 +36,6 @@ * ***** END LICENSE BLOCK ***** */ function test() { - is(gBrowser.tabs.length, 1, "one tab is open initially"); - // Add several new tabs in sequence, interrupted by selecting a // different tab, moving a tab around and closing a tab, // returning a list of opened tabs for verifying the expected order. @@ -78,9 +76,9 @@ function test() { is(tabs[3], gBrowser.tabs[1], "next tab with referrer opened further to the right"); is(tabs[4], gBrowser.tabs[4], "tab selection changed, tab opens immediately to the right"); is(tabs[5], gBrowser.tabs[6], "blank tab with referrer opens to the right of 3rd original tab where removed tab was"); - is(tabs[6], gBrowser.tabs[2], "tab has moved, new tab opens immediately to the right"); - is(tabs[7], gBrowser.tabs[8], "blank tab without referrer opens at the end"); - is(tabs[8], gBrowser.tabs[9], "tab without referrer opens at the end"); + is(tabs[6], gBrowser.tabs[2], "tab has moved, new tab opens immediately to the right"); + is(tabs[7], gBrowser.tabs[8], "blank tab without referrer opens at the end"); + is(tabs[8], gBrowser.tabs[9], "tab without referrer opens at the end"); cleanUp(tabs); } diff --git a/toolkit/themes/gnomestripe/global/tree.css b/toolkit/themes/gnomestripe/global/tree.css index 30f24339f27a..aa86d52dd5bc 100644 --- a/toolkit/themes/gnomestripe/global/tree.css +++ b/toolkit/themes/gnomestripe/global/tree.css @@ -75,17 +75,16 @@ treechildren::-moz-tree-row { height: 1.3em; } -treechildren:not(.autocomplete-treebody)::-moz-tree-row(multicol, odd) { - background-color: -moz-oddtreerow; +treechildren::-moz-tree-row(multicol, odd) { + background-color: -moz-oddtreerow; } -treechildren::-moz-tree-row(selected), -treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected) { +treechildren::-moz-tree-row(selected) { background-color: -moz-cellhighlight; } treechildren::-moz-tree-row(selected, focus), -treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected, focus) { +treechildren::-moz-tree-row(multicol, odd, selected, focus) { background-color: Highlight; } diff --git a/toolkit/themes/pinstripe/global/tree.css b/toolkit/themes/pinstripe/global/tree.css index d11ed1308423..feb3b633279b 100644 --- a/toolkit/themes/pinstripe/global/tree.css +++ b/toolkit/themes/pinstripe/global/tree.css @@ -65,19 +65,19 @@ treechildren::-moz-tree-row { background-color: -moz-field; } -treechildren:not(.autocomplete-treebody)::-moz-tree-row(multicol, odd) { - background-color: -moz-oddtreerow; +treechildren::-moz-tree-row(multicol, odd) { + background-color: -moz-oddtreerow; } treechildren::-moz-tree-row(selected), treechildren::-moz-tree-row(odd, selected), -treechildren:not(.autocomplete-treebody)::-moz-tree-row(multicol, odd, selected) { +treechildren::-moz-tree-row(multicol, odd, selected) { background-color: -moz-mac-secondaryhighlight; } treechildren::-moz-tree-row(selected, focus), treechildren::-moz-tree-row(odd, selected, focus), -treechildren:not(.autocomplete-treebody)::-moz-tree-row(multicol, odd, selected, focus) { +treechildren::-moz-tree-row(multicol, odd, selected, focus) { background-color: Highlight; color: HighlightText; }