Merge branch 'master' into editableSchema

1 files changed, 20 insertions, 15 deletions

diff --git a/src/client/views/collections/CollectionFreeFormView.scss b/src/client/views/collections/CollectionFreeFormView.scss
index 0e0570397..bdc597a25 100644
--- a/src/client/views/collections/CollectionFreeFormView.scss
+++ b/src/client/views/collections/CollectionFreeFormView.scss
@@ -7,6 +7,9 @@
     width: 100%;
   }
 
+  .inking-canvas {
+    transform-origin: 50000px 50000px;
+  }
   //nested freeform views
   // .collectionfreeformview-container {
     // background-image: linear-gradient(to right, $light-color-secondary 1px, transparent 1px),
@@ -14,22 +17,25 @@
     // background-size: 30px 30px;
   // }
 
+  box-shadow: $intermediate-color 0.2vw 0.2vw 0.8vw;
   border: 0px solid $light-color-secondary;
   border-radius: $border-radius;
   box-sizing: border-box;
   position: relative;
+  overflow: hidden;
   top: 0;
   left: 0;
   width: 100%;
   height: 100%;
-  overflow: hidden;
-  box-shadow: $intermediate-color 0.2vw 0.2vw 0.8vw;
   .collectionfreeformview {
     position: absolute;
     top: 0;
     left: 0;
     width: 100%;
     height: 100%;
+    .inking-canvas {
+      transform-origin: 50000px 50000px;
+    }
   }
 }
 .collectionfreeformview-overlay {
@@ -41,33 +47,32 @@
     background: $light-color-secondary;
   }
 
+  .inking-canvas {
+    transform-origin: 50000px 50000px;
+  }
+
   opacity: 0.99;
-  position:absolute;
   border: 0px solid transparent;
   border-radius: $border-radius;
-  overflow: hidden;
   box-sizing: border-box;
+  position:relative;
+  overflow: hidden;
   top: 0;
   left: 0;
   width: 100%;
   height: 100%;
   .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;
     width: 100%;
     height: 100%;
+    .inking-canvas {
+      transform-origin: 50000px 50000px;
+    }
+    .formattedTextBox-cont {
+        background:yellow;
+    }
   }
 }