Merge branch 'master' of github-tsch-brown:browngraphicslab/Dash-Web into kvp_ui

1 files changed, 16 insertions, 12 deletions

diff --git a/src/client/views/collections/CollectionFreeFormView.scss b/src/client/views/collections/CollectionFreeFormView.scss
index ffd440310..9c7a03b52 100644
--- a/src/client/views/collections/CollectionFreeFormView.scss
+++ b/src/client/views/collections/CollectionFreeFormView.scss
@@ -9,9 +9,9 @@
 
   //nested freeform views
   .collectionfreeformview-container {
-    background-image: linear-gradient(to right, $light-color-secondary 1px, transparent 1px),
-      linear-gradient(to bottom, $light-color-secondary 1px, transparent 1px);
-    background-size: 30px 30px;
+    // background-image: linear-gradient(to right, $light-color-secondary 1px, transparent 1px),
+    //   linear-gradient(to bottom, $light-color-secondary 1px, transparent 1px);
+    // background-size: 30px 30px;
   }
 
   border: 0px solid $light-color-secondary;
@@ -32,13 +32,6 @@
     height: 100%;
   }
 }
-.collectionfreeformview-marquee{
-    border-style: dashed;
-    box-sizing: border-box;
-    position: absolute;
-    border-width: 1px;
-    border-color: black;
-}
 .collectionfreeformview-overlay {
   .collectionfreeformview > .jsx-parser {
     position: absolute;
@@ -48,16 +41,27 @@
     background: $light-color-secondary;
   }
 
+  position:absolute;
   border: 0px solid transparent;
   border-radius: $border-radius;
+  overflow: hidden;
   box-sizing: border-box;
-  position: absolute;
   top: 0;
   left: 0;
   width: 100%;
   height: 100%;
-  overflow: hidden;
   .collectionfreeformview {
+    .collectionfreeformview > .jsx-parser{
+        position:absolute;
+        height: 100%;
+    }
+    .formattedTextBox-cont {
+        background:yellow;
+    }
+        
+    // overflow: hidden;
+    // border-style: solid;
+    // box-sizing: border-box;
     position: absolute;
     top: 0;
     left: 0;