Merge branch 'schema_view_improvements_2' of https://github.com/browngraphicslab/Dash-Web into schema_view_improvements_2

1 files changed, 69 insertions, 15 deletions

diff --git a/src/client/views/collections/CollectionSchemaView.scss b/src/client/views/collections/CollectionSchemaView.scss
index 4bc7a778c..4ae9628a9 100644
--- a/src/client/views/collections/CollectionSchemaView.scss
+++ b/src/client/views/collections/CollectionSchemaView.scss
@@ -105,6 +105,14 @@
         direction: ltr;
         max-height: $MAX_ROW_HEIGHT;
 
+        &:nth-child(even) {
+            background-color: $light-color;
+        }
+    
+        &:nth-child(odd) {
+            background-color: $light-color-secondary;
+        }
+
         &:last-child {
             border-bottom: $intermediate-color;
             border-bottom-style: solid;
@@ -112,6 +120,10 @@
         }
     }
 
+    .rt-tr {
+        width: 100%;
+    }
+
     .rt-td {
         border-width: 1px;
         border-right-color: $intermediate-color;
@@ -149,6 +161,20 @@
     background: $light-color;
 }
 
+.collectionSchema-col{
+    height: 100%;
+
+    .collectionSchema-col-wrapper {
+        &.col-before {
+            border-left: 2px solid red;
+        }
+        &.col-after {
+            border-right: 2px solid red;
+        }
+    }
+}  
+
+
 .collectionSchemaView-header {
     height: 100%;
 
@@ -168,16 +194,8 @@
 }
 
 .collectionSchema-header-menuOptions {
-    // position: absolute;
-    // top: 30px;
-    // left: 50%;
-    // transform: translateX(-50%);
-    // z-index: 9999;
-    // background-color: $light-color-secondary;
     color: black;
-    // border: 1px solid $main-accent;
     width: 175px;
-    // padding: 10px;
     text-align: left;
 
     .collectionSchema-headerMenu-group {
@@ -235,15 +253,51 @@
     }
 }
 
-#preview-schema-checkbox-div {
-    margin-left: 20px;
-    font-size: 12px;
+.collectionSchema-row {
+    height: $MAX_ROW_HEIGHT;
+    // display: flex;
+
+    .row-dragger {
+        height: $MAX_ROW_HEIGHT;
+    }
+
+    .collectionSchema-row-wrapper {
+        max-height: $MAX_ROW_HEIGHT;
+        // width: 100%;
+        // border: 1px solid lightgray;
+
+        &.row-above {
+            border-top: 1px solid red;
+        }
+        &.row-below {
+            border-bottom: 1px solid red;
+        }
+        &.row-inside {
+            border: 1px solid red;
+        }
+    }
 }
 
-.-even {
-    background: $light-color !important;
+
+.collectionSchemaView-cellWrapper {
+    // height: $MAX_ROW_HEIGHT;
+    // background-color: red;
+    height: 100%;
+    padding: 4px;
+
+    &.focused {
+        // background-color: yellowgreen;
+        border: 2px solid yellowgreen;
+
+        input {
+            outline: 0;
+            border: none;
+            background-color: yellow;
+        }
+    }
 }
 
-.-odd {
-    background: $light-color-secondary !important;
+#preview-schema-checkbox-div {
+    margin-left: 20px;
+    font-size: 12px;
 }
\ No newline at end of file