Merge branch 'text_box_ab' of https://github.com/browngraphicslab/Dash-Web into text_box_ab

1 files changed, 37 insertions, 32 deletions

diff --git a/src/client/views/collections/CollectionTreeView.scss b/src/client/views/collections/CollectionTreeView.scss
index 2dc4b2e80..5205f4313 100644
--- a/src/client/views/collections/CollectionTreeView.scss
+++ b/src/client/views/collections/CollectionTreeView.scss
@@ -4,15 +4,15 @@
     border-width: $COLLECTION_BORDER_WIDTH;
     border-color: transparent;
     border-style: solid;
-    border-radius: $border-radius;
+    border-radius: inherit;
     box-sizing: border-box;
     height: 100%;
-    padding: 20px;
+    padding-top: 20px;
     padding-left: 10px;
     padding-right: 0px;
     background: $light-color-secondary;
     font-size: 13px;
-    overflow: scroll;
+    overflow: auto;
 
     ul {
         list-style: none;
@@ -25,12 +25,10 @@
     }
 
     .bullet {
-        float: left;
         position: relative;
         width: 15px;
-        display: block;
         color: $intermediate-color;
-        margin-top: 8px;
+        margin-top: 4px;
         transform: scale(1.3, 1.3);
     }
     .editableView-container {
@@ -45,44 +43,53 @@
         display: inline;
     }
 
-
-    .docContainer:hover {
-        .delete-button {
-            display: inline;
-            // width: auto;
-        }
-    }
-
-    .coll-title {
-        width: max-content;
+    .editableView-input, .editableView-container-editing {
         display: block;
+        text-overflow: ellipsis;
         font-size: 24px;
+        white-space: nowrap;
     }
+}
+.collectionTreeView-keyHeader {
+    font-style: italic;
+    font-size: 8pt;
+    margin-left: 3px;
+    display:none;
+    background: lightgray;
+}
 
-    .collectionTreeView-keyHeader {
-        font-style: italic;
-        font-size: 8pt;
-    }
+.collectionTreeView-subtitle {
+    font-style: italic;
+    font-size: 8pt;
+    color: $intermediate-color;
 }
 
 .docContainer {
-    margin-left: 10px;
-    display: block;
+    position: relative;
+    text-overflow: ellipsis;
+    white-space: pre-wrap;
+    overflow: hidden;
     // width:100%;//width: max-content;
 
-    .treeViewItem-openRight {
-        margin-left: 5px;
-        display: none;
-    }
 }
-#docContainer-data {
-    margin-top: 5px;
+.treeViewItem-openRight {
+    display: none;
 }
 
-.docContainer:hover {
+.treeViewItem-border {
+    display:inherit;
+    border-left: dashed 1px #00000042;
+}
+
+.treeViewItem-header:hover {
+    .collectionTreeView-keyHeader {
+        display:inherit;
+    }
     .treeViewItem-openRight {
         display: inline-block;
         height:13px;
+        margin-top:2px;
+        margin-left: 5px;
         // display: inline;
         svg {
             display:block;
@@ -94,16 +101,14 @@
 
 .treeViewItem-header {
     border: transparent 1px solid;
+    display:flex;
 }
 .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