mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Closes #1044, Don't use <toolbar> for Zotero toolbar

Browse source 
Fixes problem described in ticket and ugliness in Fx3.1b3pre -- hopefully with no ill effects. Not tested on Windows or Linux.
This commit is contained in:
Dan Stillman 2009-01-07 08:27:37 +00:00
parent 7f5b01b195
commit ae10d4c5d0
2 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
chrome/content/zotero/overlay.xul
View file

@ -115,7 +115,7 @@
<!-- This extra vbox prevents the toolbar from getting compressed when resizing <!-- This extra vbox prevents the toolbar from getting compressed when resizing
the tag selector to max height --> the tag selector to max height -->
<vbox flex="1"> <vbox flex="1">
<toolbar> <hbox class="toolbar">
<toolbarbutton id="zotero-tb-collection-add" tooltiptext="&zotero.toolbar.newCollection.label;" oncommand="ZoteroPane.newCollection()"/> <toolbarbutton id="zotero-tb-collection-add" tooltiptext="&zotero.toolbar.newCollection.label;" oncommand="ZoteroPane.newCollection()"/>
<spacer flex="1"/> <spacer flex="1"/>
<toolbarbutton id="zotero-tb-tag-selector" tooltiptext="&zotero.toolbar.tagSelector.label;" oncommand="ZoteroPane.toggleTagSelector()"/> <toolbarbutton id="zotero-tb-tag-selector" tooltiptext="&zotero.toolbar.tagSelector.label;" oncommand="ZoteroPane.toggleTagSelector()"/>
@ -144,7 +144,7 @@
<menuitem id="zotero-tb-actions-about" label="&zotero.toolbar.about.label;" oncommand="window.openDialog('chrome://zotero/content/about.xul', 'about', 'chrome')"/> <menuitem id="zotero-tb-actions-about" label="&zotero.toolbar.about.label;" oncommand="window.openDialog('chrome://zotero/content/about.xul', 'about', 'chrome')"/>
</menupopup> </menupopup>
</toolbarbutton> </toolbarbutton>
</toolbar> </hbox>
<tree id="zotero-collections-tree" hidecolumnpicker="true" context="zotero-collectionmenu" <tree id="zotero-collections-tree" hidecolumnpicker="true" context="zotero-collectionmenu"
onmouseover="ZoteroPane.collectionsView.setHighlightedRows();" onmouseover="ZoteroPane.collectionsView.setHighlightedRows();"
ondblclick="ZoteroPane.onDoubleClick(event, this);" ondblclick="ZoteroPane.onDoubleClick(event, this);"
@ -173,7 +173,7 @@
<splitter id="zotero-tree-splitter" resizebefore="closest" resizeafter="closest"/> <splitter id="zotero-tree-splitter" resizebefore="closest" resizeafter="closest"/>
<vbox id="zotero-items-pane" persist="width" flex="1"> <vbox id="zotero-items-pane" persist="width" flex="1">
<toolbar align="center"> <hbox class="toolbar" align="center">
<toolbarbutton id="zotero-tb-add" tooltiptext="&zotero.toolbar.newItem.label;" type="menu"> <toolbarbutton id="zotero-tb-add" tooltiptext="&zotero.toolbar.newItem.label;" type="menu">
<!-- New Item drop-down built in overlay.js::onLoad() --> <!-- New Item drop-down built in overlay.js::onLoad() -->
<menupopup> <menupopup>
@ -203,7 +203,7 @@
ontestfail="ZoteroPane.setItemsPaneMessage(Zotero.getString('advancedSearchMode'))"> ontestfail="ZoteroPane.setItemsPaneMessage(Zotero.getString('advancedSearchMode'))">
<toolbarbutton id="zotero-tb-search-cancel" oncommand="this.parentNode.value='';" hidden="true"/> <toolbarbutton id="zotero-tb-search-cancel" oncommand="this.parentNode.value='';" hidden="true"/>
</textbox> </textbox>
</toolbar> </hbox>
<deck id="zotero-items-pane-content" selectedIndex="0" flex="1"> <deck id="zotero-items-pane-content" selectedIndex="0" flex="1">
<tree <tree
@ -311,7 +311,7 @@
<splitter id="zotero-view-splitter" resizebefore="closest" resizeafter="closest"/> <splitter id="zotero-view-splitter" resizebefore="closest" resizeafter="closest"/>
<vbox id="zotero-item-pane" persist="width"> <vbox id="zotero-item-pane" persist="width">
<toolbar align="center" pack="end"> <hbox class="toolbar" align="center" pack="end">
<hbox id="zotero-tb-sync-progress-box" hidden="true" align="center"> <hbox id="zotero-tb-sync-progress-box" hidden="true" align="center">
<toolbarbutton id="zotero-tb-sync-storage-cancel" <toolbarbutton id="zotero-tb-sync-storage-cancel"
tooltiptext="Cancel Storage Sync" tooltiptext="Cancel Storage Sync"
@ -357,7 +357,7 @@
<toolbarseparator/> <toolbarseparator/>
<toolbarbutton id="zotero-tb-fullscreen" tooltiptext="&zotero.toolbar.fullscreen.tooltip;" oncommand="ZoteroPane.fullScreen();"/> <toolbarbutton id="zotero-tb-fullscreen" tooltiptext="&zotero.toolbar.fullscreen.tooltip;" oncommand="ZoteroPane.fullScreen();"/>
<toolbarbutton class="tabs-closebutton" oncommand="ZoteroPane.toggleDisplay()"/> <toolbarbutton class="tabs-closebutton" oncommand="ZoteroPane.toggleDisplay()"/>
</toolbar> </hbox>
<groupbox flex="1"> <groupbox flex="1">
<caption> <caption>
<tabs id="zotero-view-tabs" onselect="document.getElementById('zotero-view-item').selectedIndex = this.selectedIndex;" hidden="true"> <tabs id="zotero-view-tabs" onselect="document.getElementById('zotero-view-item').selectedIndex = this.selectedIndex;" hidden="true">

9
chrome/skin/default/zotero/overlay.css
View file

@ -86,24 +86,17 @@
min-width: 335px; min-width: 335px;
} }
#zotero-pane toolbar #zotero-pane .toolbar
{ {
border: none;
height: 32px !important; /* Hard-code this to fix toolbar icon compression on Linux */ height: 32px !important; /* Hard-code this to fix toolbar icon compression on Linux */
margin: 0; margin: 0;
padding: 0; padding: 0;
background: transparent !important;
} }
#zotero-pane toolbarseparator { #zotero-pane toolbarseparator {
height:24px; height:24px;
} }
#zotero-pane toolbar .toggler
{
margin: 4px;
}
#zotero-tb-collection-add #zotero-tb-collection-add
{ {
list-style-image: url('chrome://zotero/skin/toolbar-collection-add.png'); list-style-image: url('chrome://zotero/skin/toolbar-collection-add.png');