merged embedded linking with master

1 files changed, 50 insertions, 29 deletions

diff --git a/src/client/views/collections/CollectionTreeView.scss b/src/client/views/collections/CollectionTreeView.scss
index 411d67ff7..2dc4b2e80 100644
--- a/src/client/views/collections/CollectionTreeView.scss
+++ b/src/client/views/collections/CollectionTreeView.scss
@@ -19,37 +19,20 @@
         padding-left: 20px;
     }
 
-    li {
-        margin: 5px 0;
-    }
-
 
     .no-indent {
         padding-left: 0;
     }
 
     .bullet {
-        float:left;
+        float: left;
         position: relative;
         width: 15px;
         display: block;
         color: $intermediate-color;
-        margin-top: 3px;
-        transform: scale(1.3,1.3);
-    }
-
-    .docContainer {
-        margin-left: 10px;
-        display: block;
-       // width:100%;//width: max-content;
-    }
-    .docContainer:hover {
-        .treeViewItem-openRight {
-            display:inline;
-        }
+        margin-top: 8px;
+        transform: scale(1.3, 1.3);
     }
-
-
     .editableView-container {
         font-weight: bold;
     }
@@ -61,10 +44,8 @@
         // margin-top: 3px;
         display: inline;
     }
-    .treeViewItem-openRight {
-        margin-left: 5px;
-        display:none;
-    }
+
+
     .docContainer:hover {
         .delete-button {
             display: inline;
@@ -73,16 +54,56 @@
     }
 
     .coll-title {
-        width:max-content;
+        width: max-content;
         display: block;
         font-size: 24px;
     }
-    .collection-child {
-        margin-top: 10px;
-        margin-bottom: 10px;
-    }
+
     .collectionTreeView-keyHeader {
         font-style: italic;
         font-size: 8pt;
     }
+}
+
+.docContainer {
+    margin-left: 10px;
+    display: block;
+    // width:100%;//width: max-content;
+
+    .treeViewItem-openRight {
+        margin-left: 5px;
+        display: none;
+    }
+}
+#docContainer-data {
+    margin-top: 5px;
+}
+
+.docContainer:hover {
+    .treeViewItem-openRight {
+        display: inline-block;
+        height:13px;
+        // display: inline;
+        svg {
+            display:block;
+            padding:0px;
+            margin: 0px;
+        }
+    }
+}
+
+.treeViewItem-header {
+    border: transparent 1px solid;
+}
+.treeViewItem-header-above {
+    border: transparent 1px solid;
+    border-top: black 1px solid;
+}
+.treeViewItem-header-below {
+    border: transparent 1px solid;
+    border-bottom: black 1px solid;
+}
+.treeViewItem-header-inside {
+    border: transparent 1px solid;
+    border: black 1px solid;
 }
\ No newline at end of file