Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-25 03:05:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 4d9d4960d891 (bug 873398)

Browse Source
This commit is contained in:
Mike de Boer 2013-06-13 19:36:13 +02:00
parent e0a60d6cad
commit 06673d9134
2 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
browser/components/customizableui/src/CustomizableUI.jsm
View File

@ -316,14 +316,10 @@ let CustomizableUIInternal = {
continue;
}
if (aArea == CustomizableUI.AREA_PANEL) {
if (provider == CustomizableUI.PROVIDER_XUL) {
if (provider == CustomizableUI.PROVIDER_XUL &&
aArea == CustomizableUI.AREA_PANEL) {
this.ensureButtonClosesPanel(node);
}
node.classList.add("panel-contents-button");
} else {
node.classList.remove("panel-contents-button");
}
this.ensureButtonContextMenu(node, aArea == CustomizableUI.AREA_PANEL);
this.insertWidgetBefore(node, currentNode, container, aArea);
@ -459,7 +455,6 @@ let CustomizableUIInternal = {
if (!btn.hasAttribute("noautoclose")) {
this.ensureButtonClosesPanel(btn);
}
btn.classList.add("panel-contents-button");
this.ensureButtonContextMenu(btn, true);
}
@ -493,14 +488,10 @@ let CustomizableUIInternal = {
let container = areaNode.customizationTarget;
let [provider, widgetNode] = this.getWidgetNode(aWidgetId, window);
if (aArea == CustomizableUI.AREA_PANEL) {
if (provider == CustomizableUI.PROVIDER_XUL) {
if (provider == CustomizableUI.PROVIDER_XUL &&
aArea == CustomizableUI.AREA_PANEL) {
this.ensureButtonClosesPanel(widgetNode);
}
widgetNode.classList.add("panel-contents-button");
} else {
widgetNode.classList.remove("panel-contents-button");
}
this.ensureButtonContextMenu(widgetNode, aArea == CustomizableUI.AREA_PANEL);

5
browser/themes/shared/customizableui/panelUIOverlay.inc.css
View File

@ -161,11 +161,6 @@ panelview:not([mainview]) .toolbarbutton-text,
list-style-image: url(chrome://browser/skin/customizableui/menuPanel-small-icons.png);
}
.panel-contents-button[disabled] > .toolbarbutton-icon,
.panel-combined-button[disabled] > .toolbarbutton-icon {
opacity: .5;
}
#PanelUI-contents[type="grid"] toolbarbutton > .toolbarbutton-icon,
#customization-palette toolbarbutton > .toolbarbutton-icon {
min-width: calc(8em / 3);