diff --git a/platform/firefox/bootstrap.js b/platform/firefox/bootstrap.js index 128af1d3f..0605b8378 100644 --- a/platform/firefox/bootstrap.js +++ b/platform/firefox/bootstrap.js @@ -105,7 +105,7 @@ function shutdown(data, reason) { bgProcess.parentNode.removeChild(bgProcess); - // remove the restartObserver only when the extension is being disabled + // Remove the restartObserver only when the extension is being disabled if ( data !== undefined ) { restartObserver.unregister(); } diff --git a/platform/firefox/vapi-background.js b/platform/firefox/vapi-background.js index 1aa49d445..563b6887a 100644 --- a/platform/firefox/vapi-background.js +++ b/platform/firefox/vapi-background.js @@ -648,7 +648,13 @@ vAPI.toolbarButton.init = function() { label: vAPI.app.name, tooltiptext: vAPI.app.name, onViewShowing: function({target}) { - target.firstChild.setAttribute('src', vAPI.getURL('popup.html')); + var hash = CustomizableUI.getWidget(vAPI.toolbarButton.widgetId) + .areaType === CustomizableUI.TYPE_TOOLBAR ? '' : '#body'; + + target.firstChild.setAttribute( + 'src', + vAPI.getURL('popup.html' + hash) + ); }, onViewHiding: function({target}) { target.firstChild.setAttribute('src', 'about:blank'); diff --git a/src/css/popup.css b/src/css/popup.css index 0303ced42..ccc0d6fb6 100644 --- a/src/css/popup.css +++ b/src/css/popup.css @@ -7,6 +7,9 @@ body { padding: 0; white-space: nowrap; } +#body:target { + float: none; + } h1,h2,h3,h4 { background-color: #444; border: 0; diff --git a/src/popup.html b/src/popup.html index 568aff9db..25e2172dd 100644 --- a/src/popup.html +++ b/src/popup.html @@ -8,7 +8,7 @@ µBlock - +