aboutsummaryrefslogtreecommitdiff
path: root/src/client/views/nodes/trails/PresBox.tsx
diff options
context:
space:
mode:
authorbobzel <zzzman@gmail.com>2022-09-26 11:15:03 -0400
committerbobzel <zzzman@gmail.com>2022-09-26 11:15:03 -0400
commite4e747e70686fda53167e4a13fa54f8f73f5380e (patch)
treee90516d0861e6a5f06f6618a1e4761e7e4200ca5 /src/client/views/nodes/trails/PresBox.tsx
parentd14cece23d1dac76d3bc1643e05b5b51071466ca (diff)
parentd182a3462a06ea58c4a0c937190aaa66eced0c01 (diff)
Merge branch 'tree-view-fixes'
Diffstat (limited to 'src/client/views/nodes/trails/PresBox.tsx')
-rw-r--r--src/client/views/nodes/trails/PresBox.tsx12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/client/views/nodes/trails/PresBox.tsx b/src/client/views/nodes/trails/PresBox.tsx
index 1a4ffa24f..0c4d514cd 100644
--- a/src/client/views/nodes/trails/PresBox.tsx
+++ b/src/client/views/nodes/trails/PresBox.tsx
@@ -2334,7 +2334,7 @@ export class PresBox extends ViewBoxBaseComponent<FieldViewProps>() {
const isMini: boolean = this.toolbarWidth <= 100;
return (
<div className="presBox-buttons" style={{ background: Doc.ActivePresentation === this.rootDoc ? Colors.LIGHT_BLUE : undefined, display: !this.rootDoc._chromeHidden ? 'none' : undefined }}>
- {isMini || Doc.noviceMode ? null : (
+ {isMini ? null : (
<select className="presBox-viewPicker" style={{ display: this.layoutDoc.presStatus === 'edit' ? 'block' : 'none' }} onPointerDown={e => e.stopPropagation()} onChange={this.viewChanged} value={mode}>
<option onPointerDown={StopEvent} value={CollectionViewType.Stacking}>
List
@@ -2342,9 +2342,11 @@ export class PresBox extends ViewBoxBaseComponent<FieldViewProps>() {
<option onPointerDown={StopEvent} value={CollectionViewType.Tree}>
Tree
</option>
- <option onPointerDown={StopEvent} value={CollectionViewType.Carousel3D}>
- 3D Carousel
- </option>
+ {Doc.noviceMode ? null : (
+ <option onPointerDown={StopEvent} value={CollectionViewType.Carousel3D}>
+ 3D Carousel
+ </option>
+ )}
</select>
)}
<div className="presBox-presentPanel" style={{ opacity: this.childDocs.length ? 1 : 0.3 }}>
@@ -2640,7 +2642,7 @@ export class PresBox extends ViewBoxBaseComponent<FieldViewProps>() {
{this.toolbar}
{this.newDocumentToolbarDropdown}
<div className="presBox-listCont">
- <div className="Slide" style={{ height: `calc(100% - 30px)` }}>
+ <div className="Slide">
{mode !== CollectionViewType.Invalid ? (
<CollectionView
{...this.props}