diff options
| -rw-r--r-- | application/palemoon/base/content/browser.xul | 2 | ||||
| -rw-r--r-- | browser/base/content/browser.xul | 2 | ||||
| -rw-r--r-- | devtools/client/webconsole/webconsole.xul | 2 | ||||
| -rw-r--r-- | toolkit/jetpack/sdk/panel.js | 1 | ||||
| -rw-r--r-- | toolkit/jetpack/sdk/ui/button/view.js | 4 |
5 files changed, 7 insertions, 4 deletions
diff --git a/application/palemoon/base/content/browser.xul b/application/palemoon/base/content/browser.xul index 11c4f16f9..c2553f295 100644 --- a/application/palemoon/base/content/browser.xul +++ b/application/palemoon/base/content/browser.xul @@ -13,7 +13,7 @@ <?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?> #ifdef MOZ_DEVTOOLS -<?xml-stylesheet href="chrome://global/skin/devtools/common.css" type="text/css"?> +<?xml-stylesheet href="chrome://devtools/skin/devtools-browser.css" type="text/css"?> #endif <?xml-stylesheet href="chrome://browser/skin/" type="text/css"?> diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul index 5879f2a29..485471ee3 100644 --- a/browser/base/content/browser.xul +++ b/browser/base/content/browser.xul @@ -9,7 +9,9 @@ <?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?> <?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?> <?xml-stylesheet href="chrome://browser/content/usercontext/usercontext.css" type="text/css"?> +#ifdef MOZ_DEVTOOLS <?xml-stylesheet href="chrome://devtools/skin/devtools-browser.css" type="text/css"?> +#endif <?xml-stylesheet href="chrome://browser/skin/controlcenter/panel.css" type="text/css"?> <?xml-stylesheet href="chrome://browser/skin/customizableui/panelUI.css" type="text/css"?> <?xml-stylesheet href="chrome://browser/skin/" type="text/css"?> diff --git a/devtools/client/webconsole/webconsole.xul b/devtools/client/webconsole/webconsole.xul index cd3e44d82..1310fb57d 100644 --- a/devtools/client/webconsole/webconsole.xul +++ b/devtools/client/webconsole/webconsole.xul @@ -7,6 +7,8 @@ %webConsoleDTD; ]> <?xml-stylesheet href="chrome://global/skin/" type="text/css"?> +<?xml-stylesheet href="resource://devtools/client/themes/common.css" + type="text/css"?> <?xml-stylesheet href="chrome://devtools/skin/widgets.css" type="text/css"?> <?xml-stylesheet href="chrome://devtools/skin/webconsole.css" diff --git a/toolkit/jetpack/sdk/panel.js b/toolkit/jetpack/sdk/panel.js index 4b625799d..34cde2edd 100644 --- a/toolkit/jetpack/sdk/panel.js +++ b/toolkit/jetpack/sdk/panel.js @@ -8,6 +8,7 @@ module.metadata = { "stability": "stable", "engines": { + "Palemoon": "*", "Firefox": "*", "SeaMonkey": "*" } diff --git a/toolkit/jetpack/sdk/ui/button/view.js b/toolkit/jetpack/sdk/ui/button/view.js index 552aab2f7..dcc3be59d 100644 --- a/toolkit/jetpack/sdk/ui/button/view.js +++ b/toolkit/jetpack/sdk/ui/button/view.js @@ -141,11 +141,11 @@ function create(options) { CustomizableUI.createWidget({ #endif id: id, + type: 'custom', #ifdef MC_PALEMOON onBuild: function(document, _id) { #else - type: 'custom', removable: true, defaultArea: AREA_NAVBAR, allowedAreas: [ AREA_PANEL, AREA_NAVBAR ], @@ -167,9 +167,7 @@ function create(options) { node.setAttribute('id', this.id); #endif node.setAttribute('class', 'toolbarbutton-1 chromeclass-toolbar-additional badged-button'); -#ifndef MC_PALEMOON node.setAttribute('type', type); -#endif node.setAttribute('label', label); node.setAttribute('tooltiptext', label); node.setAttribute('image', image); |