fixing compile/runtime errors.

3 files changed, 7 insertions, 14 deletions

diff --git a/src/client/views/MainView.scss b/src/client/views/MainView.scss
index e01e92101..db949285b 100644
--- a/src/client/views/MainView.scss
+++ b/src/client/views/MainView.scss
@@ -1,5 +1,5 @@
 @use 'global/globalCssVariables.module.scss' as global;
-@import 'nodeModuleOverrides';
+@use 'nodeModuleOverrides' as overrides;
 html {
     overscroll-behavior-x: none;
 }
diff --git a/src/client/views/_nodeModuleOverrides.scss b/src/client/views/_nodeModuleOverrides.scss
index db69d6e44..d06380271 100644
--- a/src/client/views/_nodeModuleOverrides.scss
+++ b/src/client/views/_nodeModuleOverrides.scss
@@ -1,9 +1,9 @@
-@import './global/globalCssVariables.module.scss';
+@use './global/globalCssVariables.module.scss' as global;
 // this file is for overriding all the css from installed node modules
 
 // goldenlayout stuff
 div .lm_header {
-    background: $dark-gray;
+    background: global.$dark-gray;
     overflow: hidden;
     height: 27px !important;
 }
@@ -30,13 +30,13 @@ div .lm_header {
 /* Handle */
 .lm_header:hover::-webkit-scrollbar-thumb {
     -webkit-appearance: none;
-    background: $dark-gray;
+    background: global.$dark-gray;
 }
 
 /* Handle on hover */
 .lm_header:hover::-webkit-scrollbar-thumb:hover {
     -webkit-appearance: none;
-    background: $dark-gray;
+    background: global.$dark-gray;
 }
 
 .lm_tabs {
@@ -44,7 +44,7 @@ div .lm_header {
     position: absolute;
     width: calc(100% - 60px);
     overflow: scroll;
-    background: transparent; //$dark-gray;
+    background: transparent; //global.$dark-gray;
     border-radius: 0px;
 }
 
@@ -54,7 +54,7 @@ div .lm_header {
     //   min-height: 1.35em;
     //   padding-bottom: 0px;
     //   border-radius: 5px;
-    font-family: $sans-serif !important;
+    font-family: global.$sans-serif !important;
 }
 
 // @TODO the ril__navgiation buttons in the img gallery are a lil messed up but I can't figure out
diff --git a/src/client/views/collections/CollectionDockingView.tsx b/src/client/views/collections/CollectionDockingView.tsx
index 04e3b2663..e51bc18ef 100644
--- a/src/client/views/collections/CollectionDockingView.tsx
+++ b/src/client/views/collections/CollectionDockingView.tsx
@@ -65,7 +65,6 @@ export class CollectionDockingView extends CollectionSubView() {
     constructor(props: SubCollectionViewProps) {
         super(props);
         makeObservable(this);
-        console.log('CREATING DOCKING VIEW');
         if (this._props.renderDepth < 0) CollectionDockingView.Instance = this;
         // Why is this here?
         (window as unknown as { React: unknown }).React = React;
@@ -282,7 +281,6 @@ export class CollectionDockingView extends CollectionSubView() {
     }
     setupGoldenLayout = async () => {
         if (this._unmounting) return;
-        console.log('SETUP LAYOUT');
         // const config = StrCast(this.Document.dockingConfig, JSON.stringify(DashboardView.resetDashboard(this.Document)));
         const config = StrCast(this.Document.dockingConfig);
         if (config) {
@@ -340,7 +338,6 @@ export class CollectionDockingView extends CollectionSubView() {
     componentDidMount: () => void = async () => {
         this._props.setContentViewBox?.(this);
         this._unmounting = false;
-        console.log('MOUNTING');
         SetPropSetterCb('title', this.titleChanged); // this overrides any previously assigned callback for the property
         if (this._containerRef.current) {
             this._disposers.lightbox = reaction(
@@ -352,7 +349,6 @@ export class CollectionDockingView extends CollectionSubView() {
                 () => StrCast(this.Document.dockingConfig),
                 config => {
                     if (!this._goldenLayout || this._ignoreStateChange !== config) {
-                        console.log('CONFIG CHANGED');
                         //  bcz: TODO! really need to diff config with ignoreStateChange and modify the current goldenLayout instead of building a new one.
                         this.setupGoldenLayout();
                     }
@@ -363,7 +359,6 @@ export class CollectionDockingView extends CollectionSubView() {
                 () => this._props.PanelWidth(),
                 width => {
                     if (!this._goldenLayout && width > 20) {
-                        console.log('PWIDTH = ' + width);
                         setTimeout(() => this.setupGoldenLayout());
                     }
                 }, // need to wait for the collectiondockingview-container to have it's width/height since golden layout reads that to configure its windows
@@ -383,7 +378,6 @@ export class CollectionDockingView extends CollectionSubView() {
     };
 
     componentWillUnmount: () => void = () => {
-        console.log('UNMOUNTING');
         this._unmounting = true;
         Object.values(this._disposers).forEach(d => d());
         try {
@@ -419,7 +413,6 @@ export class CollectionDockingView extends CollectionSubView() {
                   .map(f => f as Doc);
         const changesMade = this.Document.dockingConfig !== json;
         if (changesMade) {
-            console.log('WRITING CONFIG');
             if (![AclAdmin, AclEdit].includes(GetEffectiveAcl(this.dataDoc))) {
                 this.layoutDoc.dockingConfig = json;
                 this.layoutDoc.data = new List<Doc>(docs);