Addresses #141, Fix cosmetic issues on Windows and Linux
- Use default background for Zotero pane and get along with custom styles a bit more - Reduce padding in tag selector - Reduce margins around trees, reducing space between panes a bit - Hide splitter below collections pane when tag selector is hidden
This commit is contained in:
parent
2e1fa819ab
commit
45360c7198
|
@ -399,10 +399,12 @@ var ZoteroPane = new function()
|
||||||
|
|
||||||
function toggleTagSelector(){
|
function toggleTagSelector(){
|
||||||
var zoteroPane = document.getElementById('zotero-pane');
|
var zoteroPane = document.getElementById('zotero-pane');
|
||||||
|
var splitter = document.getElementById('zotero-tags-splitter');
|
||||||
var tagSelector = document.getElementById('zotero-tag-selector');
|
var tagSelector = document.getElementById('zotero-tag-selector');
|
||||||
|
|
||||||
var showing = tagSelector.getAttribute('collapsed') == 'true';
|
var showing = tagSelector.getAttribute('collapsed') == 'true';
|
||||||
tagSelector.setAttribute('collapsed', !showing);
|
tagSelector.setAttribute('collapsed', !showing);
|
||||||
|
splitter.setAttribute('collapsed', !showing);
|
||||||
this.updateTagSelectorSize();
|
this.updateTagSelectorSize();
|
||||||
|
|
||||||
// If showing, set scope to items in current view
|
// If showing, set scope to items in current view
|
||||||
|
@ -448,7 +450,7 @@ var ZoteroPane = new function()
|
||||||
}
|
}
|
||||||
// 121px seems to be enough room for the toolbar and collections
|
// 121px seems to be enough room for the toolbar and collections
|
||||||
// tree at minimum height
|
// tree at minimum height
|
||||||
height = height + 121;
|
height = height + 125;
|
||||||
}
|
}
|
||||||
|
|
||||||
//Zotero.debug('Setting Zotero pane minheight to ' + height);
|
//Zotero.debug('Setting Zotero pane minheight to ' + height);
|
||||||
|
|
|
@ -138,7 +138,7 @@
|
||||||
<treechildren/>
|
<treechildren/>
|
||||||
</tree>
|
</tree>
|
||||||
</vbox>
|
</vbox>
|
||||||
<splitter id="zotero-tags-splitter" onmouseup="ZoteroPane.updateTagSelectorSize()"/>
|
<splitter id="zotero-tags-splitter" persist="collapsed" onmouseup="ZoteroPane.updateTagSelectorSize()"/>
|
||||||
<zoterotagselector id="zotero-tag-selector" persist="height,collapsed,showAutomatic"
|
<zoterotagselector id="zotero-tag-selector" persist="height,collapsed,showAutomatic"
|
||||||
oncommand="ZoteroPane.updateTagFilter()"/>
|
oncommand="ZoteroPane.updateTagFilter()"/>
|
||||||
</vbox>
|
</vbox>
|
||||||
|
|
|
@ -2,7 +2,8 @@ groupbox
|
||||||
{
|
{
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
min-height: 132px;
|
min-height: 132px;
|
||||||
padding-bottom: 2px;
|
margin: 0;
|
||||||
|
padding: 1px 1px 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#tags-toggle
|
#tags-toggle
|
||||||
|
@ -56,7 +57,7 @@ groupbox > hbox
|
||||||
|
|
||||||
textbox
|
textbox
|
||||||
{
|
{
|
||||||
margin: 3px 0 2px;
|
margin: 3px 0 1px;
|
||||||
font-size: 11px !important; /* Keep font size in Linux within reason */
|
font-size: 11px !important; /* Keep font size in Linux within reason */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -80,7 +81,7 @@ groupbox > hbox > hbox
|
||||||
/* Bottom buttons */
|
/* Bottom buttons */
|
||||||
toolbarbutton.zotero-clicky
|
toolbarbutton.zotero-clicky
|
||||||
{
|
{
|
||||||
margin:3px 5px;
|
margin:2px 5px 3px;
|
||||||
padding:1px;
|
padding:1px;
|
||||||
height:1em;
|
height:1em;
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,10 +19,9 @@
|
||||||
|
|
||||||
#zotero-pane
|
#zotero-pane
|
||||||
{
|
{
|
||||||
background: #f5f5f5;
|
|
||||||
min-height: 32px; /* must match value in ZoteroPane.updateTagSelectorSize() */
|
min-height: 32px; /* must match value in ZoteroPane.updateTagSelectorSize() */
|
||||||
height: 300px;
|
height: 300px;
|
||||||
padding: 4px;
|
padding: 0 7px 4px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -50,8 +49,10 @@
|
||||||
|
|
||||||
#zotero-pane splitter
|
#zotero-pane splitter
|
||||||
{
|
{
|
||||||
background: #f5f5f5;
|
border: 0;
|
||||||
border:0;
|
width: 10px;
|
||||||
|
background-color: transparent !important;
|
||||||
|
background-image: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
#zotero-items-tree treechildren::-moz-tree-image
|
#zotero-items-tree treechildren::-moz-tree-image
|
||||||
|
@ -72,9 +73,11 @@
|
||||||
|
|
||||||
#zotero-pane toolbar
|
#zotero-pane toolbar
|
||||||
{
|
{
|
||||||
border-bottom: none;
|
border: none;
|
||||||
background: #f5f5f5;
|
height: 32px !important; /* Hard-code this to fix toolbar icon compression on Linux */
|
||||||
height: 24px;
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
background: transparent !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
#zotero-pane toolbarseparator {
|
#zotero-pane toolbarseparator {
|
||||||
|
@ -86,11 +89,6 @@
|
||||||
margin: 4px;
|
margin: 4px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#zotero-toolbar-name
|
|
||||||
{
|
|
||||||
font-size: larger;
|
|
||||||
}
|
|
||||||
|
|
||||||
#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');
|
||||||
|
@ -102,16 +100,10 @@
|
||||||
list-style-image: url(chrome://zotero/skin/tag-selector.png);
|
list-style-image: url(chrome://zotero/skin/tag-selector.png);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Hard-code this to fix toolbar icon compression on Linux */
|
#zotero-collections-tree, #zotero-items-tree, #zotero-item-pane > groupbox
|
||||||
#zotero-pane toolbar
|
|
||||||
{
|
{
|
||||||
height: 32px !important;
|
margin: 0;
|
||||||
}
|
padding: 0;
|
||||||
|
|
||||||
/* Remove extra padding on Linux */
|
|
||||||
#zotero-pane {
|
|
||||||
padding-top: 0;
|
|
||||||
padding-bottom: 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* These fix a rendering bug in Fx2.0b2 */
|
/* These fix a rendering bug in Fx2.0b2 */
|
||||||
|
@ -258,9 +250,10 @@
|
||||||
border-bottom: 1px solid #A3A3A3;
|
border-bottom: 1px solid #A3A3A3;
|
||||||
min-height: 4px;
|
min-height: 4px;
|
||||||
max-height: 4px;
|
max-height: 4px;
|
||||||
background: #f5f5f5 !important;
|
background-image: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#zotero-annotate-tb-add
|
#zotero-annotate-tb-add
|
||||||
{
|
{
|
||||||
list-style-image: url('chrome://zotero/skin/annotate-add.png');
|
list-style-image: url('chrome://zotero/skin/annotate-add.png');
|
||||||
|
|
Loading…
Reference in New Issue
Block a user