Merge branch 'master' into zach-starter

1 files changed, 38 insertions, 31 deletions

diff --git a/src/client/views/collections/collectionMulticolumn/CollectionMulticolumnView.scss b/src/client/views/collections/collectionMulticolumn/CollectionMulticolumnView.scss
index f983fd815..06d78c39e 100644
--- a/src/client/views/collections/collectionMulticolumn/CollectionMulticolumnView.scss
+++ b/src/client/views/collections/collectionMulticolumn/CollectionMulticolumnView.scss
@@ -1,43 +1,50 @@
-.collectionMulticolumnView_contents {
-    display: flex;
-    //overflow: hidden;  // bcz: turned of to allow highlighting to appear when there is no border (e.g, for a component of the slide template)
-    width: 100%;
+.collectionMulticolumnView_drop {
     height: 100%;
+    top: 0;
+    left: 0;
+    position: absolute;
 
-    .document-wrapper {
+    .collectionMulticolumnView_contents {
         display: flex;
-        flex-direction: column;
+        //overflow: hidden;  // bcz: turned of to allow highlighting to appear when there is no border (e.g, for a component of the slide template)
         width: 100%;
-        align-items: center;
-        position: relative;
-        > .iconButton-container {
-            top: 0;
-            left: 0;
-            position: absolute;
-        }
-
-        .contentFittingDocumentView {
-            margin: auto;
-        }
+        height: 100%;
 
-        .label-wrapper {
+        .document-wrapper {
             display: flex;
-            flex-direction: row;
-            justify-content: center;
-            height: 20px;
+            flex-direction: column;
+            width: 100%;
+            align-items: center;
+            position: relative;
+            > .iconButton-container {
+                top: 0;
+                left: 0;
+                position: absolute;
+            }
+
+            .contentFittingDocumentView {
+                margin: auto;
+            }
+
+            .label-wrapper {
+                display: flex;
+                flex-direction: row;
+                justify-content: center;
+                height: 20px;
+            }
         }
-    }
 
-    .multiColumnResizer {
-        cursor: ew-resize;
-        transition: 0.5s opacity ease;
-        display: flex;
-        flex-direction: column;
+        .multiColumnResizer {
+            cursor: ew-resize;
+            transition: 0.5s opacity ease;
+            display: flex;
+            flex-direction: column;
 
-        .multiColumnResizer-hdl {
-            width: 100%;
-            height: 100%;
-            transition: 0.5s background-color ease;
+            .multiColumnResizer-hdl {
+                width: 100%;
+                height: 100%;
+                transition: 0.5s background-color ease;
+            }
         }
     }
 }