From 6c201bc98541907dbe76c9fc34ec2133092e52c4 Mon Sep 17 00:00:00 2001 From: Simon Kornblith <simon@simonster.com> Date: Tue, 5 Apr 2011 23:46:53 +0000 Subject: [PATCH] use an <hbox> with -moz-appearance:toolbar instead of a <toolbar> to prevent toolbar from disappearing on pages with toolbars disabled --- chrome/content/zotero/zoteroPane.xul | 4 ++-- chrome/skin/default/zotero/overlay.css | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/chrome/content/zotero/zoteroPane.xul b/chrome/content/zotero/zoteroPane.xul index d794278cba..eb0c72c189 100644 --- a/chrome/content/zotero/zoteroPane.xul +++ b/chrome/content/zotero/zoteroPane.xul @@ -81,7 +81,7 @@ onkeyup="ZoteroPane_Local.handleKeyUp(event, this.id)" chromedir="&locale.dir;"> - <toolbar id="zotero-toolbar" class="toolbar" fullscreentoolbar="true"> + <hbox id="zotero-toolbar" class="toolbar"> <hbox id="zotero-collections-toolbar"> <toolbarbutton id="zotero-tb-collection-add" class="zotero-tb-button" tooltiptext="&zotero.toolbar.newCollection.label;" oncommand="ZoteroPane_Local.newCollection()"/> <toolbarbutton id="zotero-tb-group-add" class="zotero-tb-button" tooltiptext="&zotero.toolbar.newGroup;" oncommand="ZoteroPane_Local.newGroup()"/> @@ -208,7 +208,7 @@ <toolbarbutton id="zotero-tb-fullscreen" tooltiptext="&zotero.toolbar.tab.tooltip;" oncommand="ZoteroPane_Local.toggleTab();" class="zotero-tb-button"/> <toolbarbutton id="zotero-close-button" class="tabs-closebutton" oncommand="ZoteroOverlay.toggleDisplay()"/> </hbox> - </toolbar> + </hbox> <popupset> <menupopup id="zotero-collectionmenu" onpopupshowing="ZoteroPane_Local.buildCollectionContextMenu();"> diff --git a/chrome/skin/default/zotero/overlay.css b/chrome/skin/default/zotero/overlay.css index 8736300192..62bfa96a88 100644 --- a/chrome/skin/default/zotero/overlay.css +++ b/chrome/skin/default/zotero/overlay.css @@ -103,6 +103,7 @@ margin: 0; padding: 0; min-width: 1px; + -moz-appearance: toolbar; } #zotero-pane toolbarseparator {