Merge branch 'master' into heartbeat

1 files changed, 13 insertions, 7 deletions

diff --git a/src/client/views/collections/CollectionNoteTakingView.scss b/src/client/views/collections/CollectionNoteTakingView.scss
index 4d1f18e54..be1800d81 100644
--- a/src/client/views/collections/CollectionNoteTakingView.scss
+++ b/src/client/views/collections/CollectionNoteTakingView.scss
@@ -51,10 +51,6 @@
     display: flex;
 }
 
-.collectionNoteTakingViewFieldColumn {
-    display: flex;
-    overflow: auto;
-}
 .collectionNoteTakingViewFieldColumn:hover {
     .collectionNoteTakingView-DocumentButtons {
         display: flex;
@@ -98,6 +94,11 @@
         position: relative;
         display: block;
     }
+    .collectionNoteTakingViewFieldColumn {
+        overflow: auto;
+        display: flex;
+        flex-direction: column;
+    }
 
     .collectionSchemaView-previewDoc {
         height: 100%;
@@ -111,14 +112,19 @@
         height: auto;
     }
 
+    .collectionNoteTakingView-columnStackContainer {
+        height: 100%;
+        overflow: auto;
+        width: 100%;
+        display: flex;
+    }
     .collectionNoteTakingView-columnStack {
         height: 100%;
         width: 100%;
-        display: inline-block;
+        display: table-cell;
     }
     .collectionNoteTakingView-Nodes {
         width: 100%;
-        height: 100%;
         position: absolute;
         display: flex;
         flex-direction: column;
@@ -128,7 +134,6 @@
         width: 100%;
         position: absolute;
         margin: auto;
-        width: max-content;
         height: max-content;
         position: relative;
         grid-auto-rows: 0px;
@@ -165,6 +170,7 @@
     // 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;