From 5628b585fa6356d66cf2e7454be20e3b847ad22e Mon Sep 17 00:00:00 2001 From: bobzel Date: Fri, 8 Jul 2022 12:37:06 -0400 Subject: fixes for drawing ink on pdf/image/etc. fixes for showing contextMenu. moved gestureOverlay into main dashboard area to avoid drawing on UI widgets. more code cleanup to put things in reasonable places and avoid importing too much stuff. --- src/client/views/MainView.scss | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) (limited to 'src/client/views/MainView.scss') diff --git a/src/client/views/MainView.scss b/src/client/views/MainView.scss index a695577d0..ad87fb874 100644 --- a/src/client/views/MainView.scss +++ b/src/client/views/MainView.scss @@ -1,6 +1,5 @@ -@import "global/globalCssVariables"; -@import "nodeModuleOverrides"; - +@import 'global/globalCssVariables'; +@import 'nodeModuleOverrides'; .dash-tooltip { font-size: 11px; @@ -63,6 +62,17 @@ } } +.mainView-container, +.mainView-container-Dark { + .lm_header .lm_tab { + padding: 0px; + opacity: 0.7; + box-shadow: none; + height: 25px; + border-bottom: black solid; + } +} + .mainView-container { color: $dark-gray; @@ -183,7 +193,6 @@ background-color: $light-gray; } } - } .mainView-libraryHandle { @@ -252,7 +261,6 @@ } .buttonContainer { - position: absolute; bottom: 0; @@ -270,8 +278,6 @@ } } - - .mainView-logout { position: absolute; right: 0; @@ -309,11 +315,10 @@ } .mainView-libraryFlyout-out { - transition: width .25s; + transition: width 0.25s; box-shadow: rgb(156, 147, 150) 0.2vw 0.2vw 0.2vw; } - .mainView-libraryHandle { width: var(--flyoutHandleWidth); height: 55px; @@ -334,7 +339,6 @@ margin-right: 3px; padding-top: 19px; } - } .mainView-dashboard { @@ -371,4 +375,4 @@ display: block; width: 500px; height: 1000px; -} \ No newline at end of file +} -- cgit v1.2.3-70-g09d2 From d2f30910f30cf7016df42d86d452d45c1d408600 Mon Sep 17 00:00:00 2001 From: bobzel Date: Mon, 25 Jul 2022 11:42:25 -0400 Subject: fixed poroperties panel from overlapping lightboxView. added batches to loading of ids on startup to prevent hang from sending too much data --- src/client/util/CurrentUserUtils.ts | 9 ++++++++- src/client/views/MainView.scss | 1 - 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'src/client/views/MainView.scss') diff --git a/src/client/util/CurrentUserUtils.ts b/src/client/util/CurrentUserUtils.ts index bbf2ff3f9..f4357df7f 100644 --- a/src/client/util/CurrentUserUtils.ts +++ b/src/client/util/CurrentUserUtils.ts @@ -874,7 +874,14 @@ export class CurrentUserUtils { Doc.CurrentUserEmail = result.email; resolvedPorts = JSON.parse(await (await fetch("/resolvedPorts")).text()); DocServer.init(window.location.protocol, window.location.hostname, resolvedPorts.socket, result.email); - result.cacheDocumentIds && (await DocServer.GetRefFields(result.cacheDocumentIds.split(";"))); + if (result.cacheDocumentIds) + { + const ids = result.cacheDocumentIds.split(";"); + const batch = 10000; + for (let i = 0; i < ids.length; i = Math.min(ids.length, i+batch)) { + await DocServer.GetRefFields(ids.slice(i, i+batch)); + } + } return result; } else { throw new Error("There should be a user! Why does Dash think there isn't one?"); diff --git a/src/client/views/MainView.scss b/src/client/views/MainView.scss index ad87fb874..da79d2992 100644 --- a/src/client/views/MainView.scss +++ b/src/client/views/MainView.scss @@ -133,7 +133,6 @@ position: absolute; right: 0; top: 0; - z-index: 3000; } .mainView-propertiesDragger { -- cgit v1.2.3-70-g09d2