Merge branch 'master' into dataViz-annotations

1 files changed, 6 insertions, 2 deletions

diff --git a/src/client/views/nodes/DocumentView.scss b/src/client/views/nodes/DocumentView.scss
index b25540dd3..931594568 100644
--- a/src/client/views/nodes/DocumentView.scss
+++ b/src/client/views/nodes/DocumentView.scss
@@ -24,6 +24,8 @@
     width: 100%;
     height: 100%;
     border-radius: inherit;
+    // bcz: can't clip the title this way because groups need to be able to render outside of overflow region to support drag/drop-extending the group borders
+    // overflow: hidden; // need this so that title will be clipped when borderRadius is set
     //  transition: outline 0.3s linear;
 
     // background: $white; //overflow: hidden;
@@ -118,7 +120,7 @@
         display: flex;
         justify-content: center;
         align-items: center;
-        
+
         .sharingIndicator {
             height: 30px;
             width: 30px;
@@ -165,6 +167,7 @@
         height: 100%;
         border-radius: inherit;
         white-space: normal;
+        overflow: hidden; // so that titles will clip when borderRadius is set
 
         .documentView-styleContentWrapper {
             width: 100%;
@@ -185,6 +188,7 @@
             text-overflow: ellipsis;
             white-space: pre;
             position: absolute;
+            display: flex; // this allows title field dropdown to be inline with editable title
         }
 
         .documentView-titleWrapper-hover {
@@ -214,7 +218,7 @@
 .documentView-node:hover {
     > .documentView-styleWrapper {
         > .documentView-titleWrapper-hover {
-            display: inline-block;
+            display: flex;
         }
         // > .documentView-contentsView {
         //     opacity: 0.5;