diff options
| -rw-r--r-- | src/client/views/DocumentButtonBar.tsx | 2 | ||||
| -rw-r--r-- | src/client/views/MainView.scss | 16 | ||||
| -rw-r--r-- | src/client/views/collections/CollectionDockingView.scss | 2 | ||||
| -rw-r--r-- | src/client/views/collections/CollectionLinearView.tsx | 3 |
4 files changed, 16 insertions, 7 deletions
diff --git a/src/client/views/DocumentButtonBar.tsx b/src/client/views/DocumentButtonBar.tsx index cf2bd5176..bbe60776f 100644 --- a/src/client/views/DocumentButtonBar.tsx +++ b/src/client/views/DocumentButtonBar.tsx @@ -226,7 +226,7 @@ export class DocumentButtonBar extends React.Component<{ views: () => (DocumentV @computed get moreButton() { const targetDoc = this.view0?.props.Document; - return !targetDoc ? (null) : <Tooltip title={<><div className="dash-tooltip">{"Open Properties Panel"}</div></>}> + return !targetDoc ? (null) : <Tooltip title={<><div className="dash-tooltip">{`${CurrentUserUtils.propertiesWidth > 0 ? "Close" : "Open"} Properties Panel`}</div></>}> <div className="documentButtonBar-linker" style={{ color: "white" }} onClick={action(e => CurrentUserUtils.propertiesWidth = CurrentUserUtils.propertiesWidth > 0 ? 0 : 250)}> <FontAwesomeIcon className="documentdecorations-icon" size="sm" icon="ellipsis-h" diff --git a/src/client/views/MainView.scss b/src/client/views/MainView.scss index 9ca8f348d..aebb28859 100644 --- a/src/client/views/MainView.scss +++ b/src/client/views/MainView.scss @@ -21,6 +21,7 @@ width: 100%; height: 100%; } + .mainContent-div-flyout { left: calc(-1 * var(--flyoutHandleWidth)); } @@ -122,7 +123,7 @@ border-top-left-radius: 10px; border-bottom-left-radius: 10px; border-right: unset; - z-index: 1; + z-index: 41; // lm_maximised has a z-index of 40 and this needs to be above that display: flex; align-items: center; padding: 4px; @@ -156,6 +157,7 @@ display: contents; flex-direction: row; position: relative; + .mainView-flyoutContainer { display: flex; flex-direction: column; @@ -167,6 +169,7 @@ background: lightgrey; } } + .propertiesView { right: 0; position: absolute; @@ -181,8 +184,9 @@ .collectionStackingView { scrollbar-width: none; } + ::-webkit-scrollbar { - width:0; + width: 0; } .mainView-menuPanel-button { @@ -293,11 +297,11 @@ position: relative; display: flex; flex-direction: column; - z-index: 2; + z-index: 42; .mainView-contentArea { position: relative; - height: 100%; + height: 100%; width: 100%; overflow: visible; } @@ -311,6 +315,7 @@ margin-bottom: 10; } } + .mainView-libraryFlyout-out { transition: width .25s; box-shadow: rgb(156, 147, 150) 0.2vw 0.2vw 0.2vw; @@ -325,7 +330,7 @@ border: 1px solid black; border-radius: 8px; position: relative; - z-index: 1; + z-index: 41; // lm_maximised has a z-index of 40 and this needs to be above that touch-action: none; background-color: lightgrey; cursor: grab; @@ -369,6 +374,7 @@ width: 200px; height: 800px; } + .mainVew-invisibleWebRef { position: absolute; left: 50; diff --git a/src/client/views/collections/CollectionDockingView.scss b/src/client/views/collections/CollectionDockingView.scss index 96f5afcd9..8b1594b21 100644 --- a/src/client/views/collections/CollectionDockingView.scss +++ b/src/client/views/collections/CollectionDockingView.scss @@ -35,6 +35,7 @@ padding-right: 20px; margin-top: -1px; border-bottom: 1px black; + .collectionDockingView-gear { display: none; } @@ -44,6 +45,7 @@ padding-right: 20px; margin-top: 1px; border-bottom: unset; + .collectionDockingView-gear { display: inline-block; } diff --git a/src/client/views/collections/CollectionLinearView.tsx b/src/client/views/collections/CollectionLinearView.tsx index 9eaa02bf8..ea050011a 100644 --- a/src/client/views/collections/CollectionLinearView.tsx +++ b/src/client/views/collections/CollectionLinearView.tsx @@ -171,7 +171,8 @@ export class CollectionLinearView extends CollectionSubView(LinearDocument) { })} </div> {DocumentLinksButton.StartLink ? <span className="bottomPopup-background" style={{ - background: backgroundColor === color ? "black" : backgroundColor + background: backgroundColor === color ? "black" : backgroundColor, + pointerEvents: "all" }} onPointerDown={e => e.stopPropagation()} > <span className="bottomPopup-text" > |