Merge branch 'moreUpgrading' into dataViz-annotations

2 files changed, 5 insertions, 6 deletions

diff --git a/src/client/views/webcam/DashWebRTCVideo.scss b/src/client/views/webcam/DashWebRTCVideo.scss
index 249aee9d6..5744ebbcd 100644
--- a/src/client/views/webcam/DashWebRTCVideo.scss
+++ b/src/client/views/webcam/DashWebRTCVideo.scss
@@ -1,11 +1,11 @@
-@import "../global/globalCssVariables";
+@import '../global/globalCssVariables.module.scss';
 
 .webcam-cont {
     background: whitesmoke;
     color: grey;
     border-radius: 15px;
     box-shadow: #9c9396 0.2vw 0.2vw 0.4vw;
-    border: solid #BBBBBBBB 5px;
+    border: solid #bbbbbbbb 5px;
     pointer-events: all;
     display: flex;
     flex-direction: column;
@@ -44,7 +44,7 @@
     #roomName {
         outline: none;
         border-radius: inherit;
-        border: 1px solid #BBBBBBBB;
+        border: 1px solid #bbbbbbbb;
         margin: 10px;
         padding: 10px;
     }
@@ -79,5 +79,4 @@
         margin: 5px;
         border: 1px solid black;
     }
-
-}
\ No newline at end of file
+}
diff --git a/src/client/views/webcam/DashWebRTCVideo.tsx b/src/client/views/webcam/DashWebRTCVideo.tsx
index 524492226..093806127 100644
--- a/src/client/views/webcam/DashWebRTCVideo.tsx
+++ b/src/client/views/webcam/DashWebRTCVideo.tsx
@@ -11,7 +11,7 @@ import { DocumentView } from '../nodes/DocumentView';
 import { FieldView, FieldViewProps } from '../nodes/FieldView';
 import './DashWebRTCVideo.scss';
 import { hangup, initialize, refreshVideos } from './WebCamLogic';
-import React = require('react');
+import * as React from 'react';
 
 /**
  * This models the component that will be rendered, that can be used as a doc that will reflect the video cams.