From 44b3c4e92b1ff95654c82099ab0815f1ccf10d6f Mon Sep 17 00:00:00 2001 From: Sebastian Hengst Date: Wed, 20 Sep 2017 20:45:48 +0200 Subject: [PATCH] Backed out changeset 6de16b8f63dc (bug 1388832) for failing browser-chrome's browser/components/customizableui/test/browser_customization_context_menus.js. r=backout --- browser/base/content/browser.js | 11 +++++++++-- browser/themes/shared/customizableui/panelUI.inc.css | 4 ++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index e27f0f9c5515..7bff68841b90 100755 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -5428,8 +5428,15 @@ function onViewToolbarsPopupShowing(aEvent, aInsertPoint) { if (toolbarItem && toolbarItem.localName == "toolbarpaletteitem") { toolbarItem = toolbarItem.firstChild; } else if (toolbarItem && toolbarItem.localName != "toolbar") { - toolbarItem = toolbarItem.closest( - ".customization-target, [overflowfortoolbar], toolbarpaletteitem, toolbar"); + while (toolbarItem && toolbarItem.parentNode) { + let parent = toolbarItem.parentNode; + if ((parent.classList && parent.classList.contains("customization-target")) || + parent.getAttribute("overflowfortoolbar") || // Needs to work in the overflow list as well. + parent.localName == "toolbarpaletteitem" || + parent.localName == "toolbar") + break; + toolbarItem = parent; + } } else { toolbarItem = null; } diff --git a/browser/themes/shared/customizableui/panelUI.inc.css b/browser/themes/shared/customizableui/panelUI.inc.css index f8cb77f6e4f0..2e2529aa7522 100644 --- a/browser/themes/shared/customizableui/panelUI.inc.css +++ b/browser/themes/shared/customizableui/panelUI.inc.css @@ -1622,8 +1622,8 @@ toolbarpaletteitem[place="palette"] > .toolbarbutton-1 > .toolbarbutton-menubutt } #search-container[cui-areatype="menu-panel"] { - padding-top: 6px; - padding-bottom: 6px; + margin-top: 6px; + margin-bottom: 6px; } toolbarpaletteitem[place="palette"] > #search-container {