Merge branch 'master' into alyssa-starter

1 files changed, 40 insertions, 14 deletions

diff --git a/src/client/views/collections/collectionSchema/CollectionSchemaView.scss b/src/client/views/collections/collectionSchema/CollectionSchemaView.scss
index 6fb8e40db..817ceac97 100644
--- a/src/client/views/collections/collectionSchema/CollectionSchemaView.scss
+++ b/src/client/views/collections/collectionSchema/CollectionSchemaView.scss
@@ -50,18 +50,15 @@
 .schema-column-menu,
 .schema-filter-menu {
     background: $light-gray;
-    position: relative;
-    min-width: 200px;
-    max-width: 400px;
+    position: absolute;
+    border: 1px solid $medium-gray;
+    border-bottom: 2px solid $medium-gray;
+    max-height: 201px;
     display: flex;
+    overflow: hidden;
     flex-direction: column;
     align-items: flex-start;
-    z-index: 1;
-
-    .schema-key-search-input {
-        width: calc(100% - 20px);
-        margin: 10px;
-    }
+    z-index: 5;
 
     .schema-search-result {
         cursor: pointer;
@@ -104,7 +101,7 @@
 
     .schema-key-list {
         width: 100%;
-        max-height: 300px;
+        max-height: 250px;
         overflow-y: auto;
     }
 
@@ -153,12 +150,18 @@
     padding: 0;
     z-index: 1;
     border: 1px solid $medium-gray;
-    //overflow: hidden;
 
     .schema-column-title {
         flex-grow: 2;
         margin: 5px;
         overflow: hidden;
+        min-width: 100%;
+    }
+
+    .schema-column-edit-wrapper {
+        flex-grow: 2;
+        margin: 5px;
+        overflow: hidden;
         min-width: 20%;
     }
 
@@ -176,6 +179,11 @@
         }
     }
 
+    .editableView-input {
+        border: none;
+        outline: none;
+    }
+
     /*.schema-column-resizer.left {
         min-width: 5px;
         transform: translate(-3px, 0px);
@@ -245,9 +253,6 @@
         flex-direction: row;
         min-width: 50px;
         justify-content: center;
-        .iconButton-container {
-            min-width: unset !important;
-        }
     }
 
     .row-cells {
@@ -255,6 +260,20 @@
         flex-direction: row;
         justify-content: flex-end;
     }
+
+    .row-menu-infos {
+        position: absolute;
+        top: 3;
+        left: 3; 
+        z-index: 1;
+        display: flex;
+        justify-content: flex-end;
+        align-items: center;
+
+        .row-infos-icon {
+            padding-right: 2px;
+        }
+    }
 }
 
 .schema-row-button,
@@ -287,3 +306,10 @@
         width: 12px;
     }
 }
+
+.schemaField-editing {
+    outline: none;
+    height: 100%;
+}
+
+