aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbob <bcz@cs.brown.edu>2020-01-16 11:43:38 -0500
committerbob <bcz@cs.brown.edu>2020-01-16 11:43:38 -0500
commitfcd9313158f8c131cf5a124880c46ca7b20a1b25 (patch)
treeb6ae6ca19f464c9034e98509a0eea3a9cba2caad
parente410cde0e430553002d4e1a2f64364b57b65fdbc (diff)
better fix for sidebar / stacking view sizing
-rw-r--r--src/client/views/MainView.scss8
-rw-r--r--src/client/views/collections/CollectionStackingView.tsx2
2 files changed, 1 insertions, 9 deletions
diff --git a/src/client/views/MainView.scss b/src/client/views/MainView.scss
index c7fc6096a..4c8c95529 100644
--- a/src/client/views/MainView.scss
+++ b/src/client/views/MainView.scss
@@ -5,9 +5,6 @@
.mainView-tabButtons {
position: relative;
width: 100%;
- .documentView-node-topmost {
- height: 200% !important;
- }
}
.mainContent-div {
@@ -16,11 +13,6 @@
height:100%;
}
-.mainView-contentArea {
- .documentView-node-topmost {
- height: 200% !important;
- }
-}
// add nodes menu. Note that the + button is actually an input label, not an actual button.
.mainView-docButtons {
position: absolute;
diff --git a/src/client/views/collections/CollectionStackingView.tsx b/src/client/views/collections/CollectionStackingView.tsx
index 886a9c870..ca792c134 100644
--- a/src/client/views/collections/CollectionStackingView.tsx
+++ b/src/client/views/collections/CollectionStackingView.tsx
@@ -396,7 +396,7 @@ export class CollectionStackingView extends CollectionSubView(doc => doc) {
ref={this.createRef}
style={{
transform: `scale(${Math.min(1, this.props.PanelHeight() / this.layoutDoc[HeightSym]())})`,
- height: `${100 * 1 / Math.min(this.props.PanelWidth() / this.layoutDoc[WidthSym](), this.props.PanelHeight() / this.layoutDoc[HeightSym]())}%`,
+ height: `${Math.max(100, 100 * 1 / Math.min(this.props.PanelWidth() / this.layoutDoc[WidthSym](), this.props.PanelHeight() / this.layoutDoc[HeightSym]()))}%`,
transformOrigin: "top"
}}
onScroll={action((e: React.UIEvent<HTMLDivElement>) => this._scroll = e.currentTarget.scrollTop)}