From 6e90a5a7f4d4ed3e92d2ff8af6c1400768c95cd0 Mon Sep 17 00:00:00 2001
From: Tyler Schicke <tyler_schicke@brown.edu>
Date: Thu, 11 Apr 2019 15:57:32 -0400
Subject: Fixed style import stuff

---
 src/client/util/DragManager.ts               | 4 ++--
 src/client/views/_global_variables.scss.d.ts | 6 +++---
 src/client/views/_global_variables.ts        | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/client/util/DragManager.ts b/src/client/util/DragManager.ts
index d66c6e90f..333c474c1 100644
--- a/src/client/util/DragManager.ts
+++ b/src/client/util/DragManager.ts
@@ -5,8 +5,8 @@ import { CollectionDockingView } from "../views/collections/CollectionDockingVie
 import { DocumentDecorations } from "../views/DocumentDecorations";
 import { Main } from "../views/Main";
 import { DocumentView } from "../views/nodes/DocumentView";
-import globalStyles from "../views/_global_variables";
-// import globalStyleVariables from "../views/_global_variables.scss"; // bcz: why doesn't this work?
+// import globalStyles from "../views/_global_variables";
+import * as globalStyles from "../views/_global_variables.scss"; // bcz: why doesn't this work?
 
 export function setupDrag(_reference: React.RefObject<HTMLDivElement>, docFunc: () => Document, moveFunc?: DragManager.MoveFunction, copyOnDrop: boolean = false) {
     let onRowMove = action((e: PointerEvent): void => {
diff --git a/src/client/views/_global_variables.scss.d.ts b/src/client/views/_global_variables.scss.d.ts
index c902d473f..ebee7dbce 100644
--- a/src/client/views/_global_variables.scss.d.ts
+++ b/src/client/views/_global_variables.scss.d.ts
@@ -1,7 +1,7 @@
 
-export interface I_globalScss {
+interface IGlobalScss {
     contextMenuZindex: string;  // context menu shows up over everything
 }
-export const globalStyleVariables: I_globalScss;
+declare const globalStyleVariables: IGlobalScss;
 
-export default globalStyleVariables;
\ No newline at end of file
+export = globalStyleVariables;
\ No newline at end of file
diff --git a/src/client/views/_global_variables.ts b/src/client/views/_global_variables.ts
index e70bfd56c..caedc7aad 100644
--- a/src/client/views/_global_variables.ts
+++ b/src/client/views/_global_variables.ts
@@ -1,8 +1,8 @@
-import * as globalStyleVariables from "../views/_global_variables.scss"
+import * as globalStyleVariables from "../views/_global_variables.scss";
 
-export interface I_globalScss {
+export interface IGlobalScss {
     contextMenuZindex: string;  // context menu shows up over everything
 }
-let globalStyles = globalStyleVariables as any as I_globalScss;
+let globalStyles = globalStyleVariables as any as IGlobalScss;
 
 export default globalStyles;
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2