Prevent window overflow in Standard mode

This commit is contained in:
Abe Jellinek 2024-01-24 03:22:17 -05:00 committed by Dan Stillman
parent 613a907f3e
commit 3472d6cabe
13 changed files with 38 additions and 34 deletions

View file

@ -27,7 +27,6 @@
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<?xml-stylesheet href="chrome://zotero/skin/zotero.css" type="text/css"?> <?xml-stylesheet href="chrome://zotero/skin/zotero.css" type="text/css"?>
<?xml-stylesheet href="chrome://zotero/skin/standalone.css" type="text/css"?>
<?xul-overlay href="chrome://zotero/content/standalone/editMenuOverlay.xul"?> <?xul-overlay href="chrome://zotero/content/standalone/editMenuOverlay.xul"?>
<?xul-overlay href="chrome://zotero-platform/content/standalone/menuOverlay.xul"?> <?xul-overlay href="chrome://zotero-platform/content/standalone/menuOverlay.xul"?>

View file

@ -27,7 +27,6 @@
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<?xml-stylesheet href="chrome://zotero/skin/zotero.css" type="text/css"?> <?xml-stylesheet href="chrome://zotero/skin/zotero.css" type="text/css"?>
<?xml-stylesheet href="chrome://zotero/skin/standalone.css" type="text/css"?>
<?xml-stylesheet href="chrome://zotero/skin/overlay.css" type="text/css"?> <?xml-stylesheet href="chrome://zotero/skin/overlay.css" type="text/css"?>
<?xml-stylesheet href="chrome://zotero-platform/content/overlay.css" type="text/css"?> <?xml-stylesheet href="chrome://zotero-platform/content/overlay.css" type="text/css"?>
<?xml-stylesheet href="chrome://zotero-platform-version/content/style.css"?> <?xml-stylesheet href="chrome://zotero-platform-version/content/style.css"?>

View file

@ -4,12 +4,6 @@
overflow: hidden; overflow: hidden;
} }
#zotero-collections-pane
{
min-width: 250px;
width: 250px;
}
#zotero-items-tree treechildren::-moz-tree-image(hasAttachment, pie) #zotero-items-tree treechildren::-moz-tree-image(hasAttachment, pie)
{ {
margin: 1px 0 0; margin: 1px 0 0;
@ -182,14 +176,6 @@
text-decoration: underline; text-decoration: underline;
} }
#zotero-item-pane
{
width: 342px;
min-width: 342px;
/* Need a min height to prevent layout issues in stacked mode */
min-height: 168px;
}
#zotero-layout-switcher #zotero-layout-switcher
{ {
height: 0; height: 0;

View file

@ -1,4 +0,0 @@
#main-window {
min-width: 670px;
min-height: 300px;
}

View file

@ -58,6 +58,7 @@
@import "components/tabsMenu"; @import "components/tabsMenu";
@import "components/newCollectionDialog"; @import "components/newCollectionDialog";
@import "components/reader"; @import "components/reader";
@import "components/itemPane";
// Elements // Elements
// -------------------------------------------------- // --------------------------------------------------

View file

@ -104,3 +104,10 @@ $tagColorsLookup: (
'#a28ae5': --tag-purple, '#a28ae5': --tag-purple,
'#a6507b': --tag-plum, '#a6507b': --tag-plum,
); );
// Layout constants
// --------------------------------------------------
$min-width-collections-pane: 200px;
$min-width-items-pane: 370px;
$min-width-item-pane: 300px;
$width-sidenav: 37px;

View file

@ -25,17 +25,6 @@
background: var(--material-sidepane); background: var(--material-sidepane);
} }
#zotero-items-pane-container {
min-width: 370px;
}
#zotero-items-pane {
min-width: 370px;
min-height: 150px;
height: 150px;
width: 290px;
}
#zotero-title-bar { #zotero-title-bar {
border-bottom: var(--material-panedivider); border-bottom: var(--material-panedivider);
} }

View file

@ -11,6 +11,11 @@ $icons: (
} }
} }
#zotero-collections-pane {
min-width: $min-width-collections-pane;
width: $min-width-collections-pane;
}
#zotero-collections-tree-container { #zotero-collections-tree-container {
height: 5.2em; height: 5.2em;
} }

View file

@ -1,10 +1,10 @@
#tabs-deck { #tabs-deck {
min-width: 600px; min-width: $min-width-collections-pane + $min-width-items-pane;
} }
#zotero-context-pane { #zotero-context-pane {
display: flex; display: flex;
min-width: 360px; min-width: $min-width-item-pane;
.divider { .divider {
border-bottom: 1px solid var(--fill-quinary); border-bottom: 1px solid var(--fill-quinary);

View file

@ -1,7 +1,17 @@
@use "sass:map"; @use "sass:map";
#zotero-items-tree { #zotero-items-pane-container {
min-width: $min-width-items-pane;
}
#zotero-items-pane {
min-width: $min-width-items-pane;
min-height: 150px;
height: 150px;
width: 290px;
}
#zotero-items-tree {
.virtualized-table-body, .drag-image-container { .virtualized-table-body, .drag-image-container {
padding: 4px 8px 8px; padding: 4px 8px 8px;
} }

View file

@ -0,0 +1,6 @@
#zotero-item-pane {
width: $min-width-item-pane;
min-width: $min-width-item-pane;
/* Need a min height to prevent layout issues in stacked mode */
min-height: 168px;
}

View file

@ -141,6 +141,11 @@
--panel-background: var(--material-toolbar); --panel-background: var(--material-toolbar);
} }
#main-window {
min-width: $min-width-collections-pane + $min-width-items-pane + $min-width-item-pane + $width-sidenav;
min-height: 300px;
}
#zotero-pane-stack > hbox { #zotero-pane-stack > hbox {
// Let window chrome, tabs, and toolbar shrink even when sidebars overflow // Let window chrome, tabs, and toolbar shrink even when sidebars overflow
min-width: 0; min-width: 0;

View file

@ -11,6 +11,7 @@ item-pane-sidenav {
gap: 6px; gap: 6px;
background: var(--material-sidepane); background: var(--material-sidepane);
position: relative; // Stop item pane content from overlapping position: relative; // Stop item pane content from overlapping
width: $width-sidenav;
&.stacked { &.stacked {
flex-direction: row; flex-direction: row;