Merge branch 'master' into data-visualization-view-naafi

1 files changed, 38 insertions, 11 deletions

diff --git a/src/client/views/collections/CollectionNoteTakingView.scss b/src/client/views/collections/CollectionNoteTakingView.scss
index fe98f307e..be1800d81 100644
--- a/src/client/views/collections/CollectionNoteTakingView.scss
+++ b/src/client/views/collections/CollectionNoteTakingView.scss
@@ -1,7 +1,7 @@
 @import '../global/globalCssVariables';
 
 .collectionNoteTakingView-DocumentButtons {
-    display: flex;
+    display: none;
     justify-content: space-between;
     margin: auto;
 }
@@ -51,6 +51,12 @@
     display: flex;
 }
 
+.collectionNoteTakingViewFieldColumn:hover {
+    .collectionNoteTakingView-DocumentButtons {
+        display: flex;
+    }
+}
+
 // TODO:glr Turn this into a seperate class
 .documentButtonMenu {
     position: relative;
@@ -82,13 +88,17 @@
     top: 0;
     overflow-y: auto;
     overflow-x: hidden;
-    flex-wrap: wrap;
     transition: top 0.5s;
 
     > div {
         position: relative;
         display: block;
     }
+    .collectionNoteTakingViewFieldColumn {
+        overflow: auto;
+        display: flex;
+        flex-direction: column;
+    }
 
     .collectionSchemaView-previewDoc {
         height: 100%;
@@ -102,9 +112,19 @@
         height: auto;
     }
 
-    .collectionNoteTakingView-Nodes {
+    .collectionNoteTakingView-columnStackContainer {
+        height: 100%;
+        overflow: auto;
         width: 100%;
+        display: flex;
+    }
+    .collectionNoteTakingView-columnStack {
         height: 100%;
+        width: 100%;
+        display: table-cell;
+    }
+    .collectionNoteTakingView-Nodes {
+        width: 100%;
         position: absolute;
         display: flex;
         flex-direction: column;
@@ -113,6 +133,10 @@
         left: 0;
         width: 100%;
         position: absolute;
+        margin: auto;
+        height: max-content;
+        position: relative;
+        grid-auto-rows: 0px;
     }
 
     .collectionNoteTakingView-description {
@@ -133,9 +157,20 @@
         margin-left: -5;
     }
 
+    .collectionNoteTakingView-sectionDelete {
+        display: none;
+        position: absolute;
+        right: 0;
+        width: max-content;
+        height: max-content;
+        top: 10;
+        padding: 2;
+    }
+
     // Documents in NoteTaking view
     .collectionNoteTakingView-columnDoc {
         display: flex;
+        width: 100%;
         // margin: auto; // Removed auto so that it is no longer center aligned - this could be something we change
         position: relative;
 
@@ -347,14 +382,6 @@
                 }
             }
         }
-
-        .collectionNoteTakingView-sectionDelete {
-            position: absolute;
-            right: 25px;
-            top: 0;
-            height: 100%;
-            display: none;
-        }
     }
 
     .collectionNoteTakingView-sectionHeader:hover {