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

Fix merge pane overflow behavior

Browse source 
The item box CE can't be the scroll container, so it needs a wrapper element.

Fixes #3233
This commit is contained in:
Abe Jellinek 2023-07-28 15:05:34 -04:00
parent 7036073ed1
commit cbece42fb9
2 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
chrome/content/zotero/zoteroPane.xhtml
View file

@ -1114,7 +1114,7 @@
</groupbox> </groupbox>
<!-- Duplicate merging --> <!-- Duplicate merging -->
<vbox id="zotero-duplicates-merge-pane" flex="1"> <vbox id="zotero-duplicates-merge-pane">
<groupbox> <groupbox>
<button id="zotero-duplicates-merge-button" oncommand="Zotero_Duplicates_Pane.merge()"/> <button id="zotero-duplicates-merge-button" oncommand="Zotero_Duplicates_Pane.merge()"/>
</groupbox> </groupbox>
@ -1128,7 +1128,9 @@
<groupbox flex="1"> <groupbox flex="1">
<description id="zotero-duplicates-merge-field-select">&zotero.duplicatesMerge.fieldSelect;</description> <description id="zotero-duplicates-merge-field-select">&zotero.duplicatesMerge.fieldSelect;</description>
<vbox id="zotero-duplicates-merge-item-box-container" flex="1">
<item-box id="zotero-duplicates-merge-item-box" flex="1"/> <item-box id="zotero-duplicates-merge-item-box" flex="1"/>
</vbox>
</groupbox> </groupbox>
</vbox> </vbox>
</deck> </deck>

7
chrome/skin/default/zotero/itemPane.css
View file

@ -76,15 +76,10 @@
margin: 8px 0 0 0; margin: 8px 0 0 0;
} }
#zotero-duplicates-merge-item-box { #zotero-duplicates-merge-item-box-container {
overflow-y: scroll; overflow-y: scroll;
} }
#zotero-duplicates-merge-item-box row
{
min-height: 20px;
}
#zotero-feed-item-toggleRead-button { #zotero-feed-item-toggleRead-button {
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;