merged embedded linking with master

1 files changed, 61 insertions, 25 deletions

diff --git a/src/client/views/collections/CollectionSchemaView.scss b/src/client/views/collections/CollectionSchemaView.scss
index 5e9d2ac67..186e006f3 100644
--- a/src/client/views/collections/CollectionSchemaView.scss
+++ b/src/client/views/collections/CollectionSchemaView.scss
@@ -4,56 +4,63 @@
 
 .collectionSchemaView-container {
     border-width: $COLLECTION_BORDER_WIDTH;
-    border-color : $intermediate-color;
+    border-color: $intermediate-color;
     border-style: solid;
     border-radius: $border-radius;
     box-sizing: border-box;
     position: absolute;
     width: 100%;
     height: 100%;
+    overflow: hidden;
 
     .collectionSchemaView-cellContents {
         height: $MAX_ROW_HEIGHT;
+
         img {
-            width:auto;
+            width: auto;
             max-height: $MAX_ROW_HEIGHT;
         }
     }
-    
+
     .collectionSchemaView-previewRegion {
         position: relative;
         background: $light-color;
         float: left;
         height: 100%;
+
         .collectionSchemaView-previewDoc {
             height: 100%;
-            width: 100%; 
+            width: 100%;
             position: absolute;
         }
+
         .collectionSchemaView-input {
             position: absolute;
             max-width: 150px;
             width: 100%;
             bottom: 0px;
         }
+
         .documentView-node:first-child {
             position: relative;
             background: $light-color;
         }
     }
+
     .collectionSchemaView-previewHandle {
         position: absolute;
         height: 15px;
-        width: 15px; 
-        z-index: 20; 
-        right: 0; 
-        top: 20px; 
-        background: Black ;
+        width: 15px;
+        z-index: 20;
+        right: 0;
+        top: 20px;
+        background: Black;
     }
-    .collectionSchemaView-dividerDragger{
-        position: relative; 
-        background: black; 
-        float: left; 
+
+    .collectionSchemaView-dividerDragger {
+        position: relative;
+        background: black;
+        float: left;
         height: 37px;
         width: 20px;
         z-index: 20;
@@ -61,6 +68,7 @@
         top: 0;
         background: $main-accent;
     }
+
     .collectionSchemaView-columnsHandle {
         position: absolute;
         height: 37px;
@@ -70,6 +78,7 @@
         bottom: 0;
         background: $main-accent;
     }
+
     .collectionSchemaView-colDividerDragger {
         position: relative;
         box-sizing: border-box;
@@ -78,6 +87,7 @@
         float: top;
         width: 100%;
     }
+
     .collectionSchemaView-dividerDragger {
         position: relative;
         box-sizing: border-box;
@@ -86,11 +96,13 @@
         float: left;
         height: 100%;
     }
+
     .collectionSchemaView-tableContainer {
         position: relative;
         float: left;
         height: 100%;
     }
+
     .ReactTable {
         // position: absolute; // display: inline-block;
         // overflow: auto;
@@ -99,6 +111,7 @@
         background: $light-color;
         box-sizing: border-box;
         border: none !important;
+
         .rt-table {
             overflow-y: auto;
             overflow-x: auto;
@@ -107,26 +120,32 @@
             direction: ltr; // direction:rtl;
             // display:block;
         }
+
         .rt-tbody {
             //direction: ltr;
             direction: rtl;
         }
+
         .rt-tr-group {
             direction: ltr;
             max-height: $MAX_ROW_HEIGHT;
         }
+
         .rt-td {
             border-width: 1px;
             border-right-color: $intermediate-color;
+
             .imageBox-cont {
                 position: relative;
                 max-height: 100%;
             }
+
             .imageBox-cont img {
                 object-fit: contain;
                 max-width: 100%;
                 height: 100%;
             }
+
             .videoBox-cont {
                 object-fit: contain;
                 width: auto;
@@ -134,15 +153,17 @@
             }
         }
     }
+
     .ReactTable .rt-thead.-header {
         background: $intermediate-color;
         color: $light-color;
-        text-transform: uppercase;
+        // text-transform: uppercase;
         letter-spacing: 2px;
         font-size: 12px;
         height: 30px;
         padding-top: 4px;
     }
+
     .ReactTable .rt-th,
     .ReactTable .rt-td {
         max-height: $MAX_ROW_HEIGHT;
@@ -150,32 +171,36 @@
         font-size: 13px;
         text-align: center;
     }
+
     .ReactTable .rt-tbody .rt-tr-group:last-child {
         border-bottom: $intermediate-color;
         border-bottom-style: solid;
         border-bottom-width: 1;
     }
+
     .documentView-node-topmost {
-        text-align:left;
+        text-align: left;
         transform-origin: center top;
         display: inline-block;
     }
+
     .documentView-node:first-child {
         background: $light-color;
     }
 }
+
 //options menu styling
 #schemaOptionsMenuBtn {
     position: absolute;
     height: 20px;
     width: 20px;
     border-radius: 50%;
-    z-index: 21; 
+    z-index: 21;
     right: 4px;
-    top: 4px; 
+    top: 4px;
     pointer-events: auto;
-    background-color:black;
-    display:inline-block;
+    background-color: black;
+    display: inline-block;
     padding: 0px;
     font-size: 100%;
 }
@@ -189,10 +214,12 @@ ul {
     padding: 0px;
     margin: 0px;
 }
+
 .schema-options-subHeader {
     color: $intermediate-color;
     margin-bottom: 5px;
 }
+
 #schemaOptionsMenuBtn:hover {
     transform: scale(1.15);
 }
@@ -202,15 +229,15 @@ ul {
     font-size: 12px;
 }
 
-  #options-flyout-div {
+#options-flyout-div {
     text-align: left;
-    padding:0px;
+    padding: 0px;
     z-index: 100;
     font-family: $sans-serif;
     padding-left: 5px;
-  }
+}
 
-  #schema-col-checklist {
+#schema-col-checklist {
     overflow: scroll;
     text-align: left;
     //background-color: $light-color-secondary;
@@ -218,8 +245,8 @@ ul {
     max-height: 175px;
     font-family: $sans-serif;
     font-size: 12px;
-  }
-  
+}
+
 
 .Resizer {
     box-sizing: border-box;
@@ -227,6 +254,7 @@ ul {
     opacity: 0.5;
     z-index: 1;
     background-clip: padding-box;
+
     &.horizontal {
         height: 11px;
         margin: -5px 0;
@@ -234,22 +262,26 @@ ul {
         border-bottom: 5px solid rgba(255, 255, 255, 0);
         cursor: row-resize;
         width: 100%;
+
         &:hover {
             border-top: 5px solid rgba(0, 0, 0, 0.5);
             border-bottom: 5px solid rgba(0, 0, 0, 0.5);
         }
     }
+
     &.vertical {
         width: 11px;
         margin: 0 -5px;
         border-left: 5px solid rgba(255, 255, 255, 0);
         border-right: 5px solid rgba(255, 255, 255, 0);
         cursor: col-resize;
+
         &:hover {
             border-left: 5px solid rgba(0, 0, 0, 0.5);
             border-right: 5px solid rgba(0, 0, 0, 0.5);
         }
     }
+
     &:hover {
         -webkit-transition: all 2s ease;
         transition: all 2s ease;
@@ -270,10 +302,12 @@ ul {
         -ms-flex-direction: column;
         flex-direction: column;
     }
+
     header {
         padding: 1rem;
         background: #eee;
     }
+
     footer {
         padding: 1rem;
         background: #eee;
@@ -287,10 +321,12 @@ ul {
         display: flex;
         flex-direction: column;
     }
+
     header {
         padding: 1rem;
         background: #eee;
     }
+
     footer {
         padding: 1rem;
         background: #eee;