diff --git a/chrome/content/zotero/components/virtualized-table.jsx b/chrome/content/zotero/components/virtualized-table.jsx index 911b844c1d..3ad8689cec 100644 --- a/chrome/content/zotero/components/virtualized-table.jsx +++ b/chrome/content/zotero/components/virtualized-table.jsx @@ -1084,10 +1084,13 @@ class VirtualizedTable extends React.Component { const header = document.querySelector(`#${this.props.id} .virtualized-table-header`); const scrollbarWidth = Math.max(0, tree.getBoundingClientRect().width - jsWindow.getBoundingClientRect().width); + let paddingWidth = 0; + if (Zotero.isLinux) { + paddingWidth = 2; // from the border + } // Should be kept up to date with the _virtualized-table.scss value // for .virtualized-table-header - const paddingInlineStart = 6; - header.style.width = `calc(100% - ${scrollbarWidth+paddingInlineStart}px)`; + header.style.width = `calc(100% - ${scrollbarWidth-paddingWidth}px)`; } /** diff --git a/chrome/content/zotero/itemTree.jsx b/chrome/content/zotero/itemTree.jsx index 10ad3bbd1a..f41e9089ab 100644 --- a/chrome/content/zotero/itemTree.jsx +++ b/chrome/content/zotero/itemTree.jsx @@ -87,7 +87,11 @@ function makeItemRenderer(itemTree) { // Set depth indent const depth = itemTree.getLevel(index); - span.style.paddingInlineStart = (CHILD_INDENT * depth) + 'px'; + let firstChildIndent = 0; + if (column.ordinal == 0) { + firstChildIndent = 6; + } + span.style.paddingInlineStart = ((CHILD_INDENT * depth) + firstChildIndent) + 'px'; return span; } diff --git a/scss/components/_virtualized-table.scss b/scss/components/_virtualized-table.scss index ba4f9c092e..f37bccf196 100644 --- a/scss/components/_virtualized-table.scss +++ b/scss/components/_virtualized-table.scss @@ -38,6 +38,10 @@ cursor: col-resize; } } + + .cell:first-child { + padding-inline-start: 6px; + } .cell { min-width: 30px; @@ -142,7 +146,6 @@ height: 1.8em; overflow: hidden; border-inline-end: 1px solid #ddd; - padding-inline-start: 6px; &.static-columns { pointer-events: none; @@ -212,10 +215,6 @@ max-width: 100%; overflow: auto; - .row { - padding-inline-start: 6px; - } - .cell { padding: 2px 5px; text-overflow: ellipsis;