Merge branch 'master' into sophie-pres-transitions

1 files changed, 57 insertions, 6 deletions

diff --git a/src/client/views/nodes/DataVizBox/components/Chart.scss b/src/client/views/nodes/DataVizBox/components/Chart.scss
index 41ce637ac..cf0007cfd 100644
--- a/src/client/views/nodes/DataVizBox/components/Chart.scss
+++ b/src/client/views/nodes/DataVizBox/components/Chart.scss
@@ -120,11 +120,62 @@
         }
     }
 }
-.selectAll-buttons {
-    display: flex;
-    flex-direction: row;
-    justify-content: flex-end;
+.tableBox-selectButtons {
     margin-top: 5px;
-    margin-right: 10px;
-    float: right;
+    margin-left: 25px;
+    display: inline-block;
+    padding: 2px;
+    .tableBox-selectTitle {
+        display: inline-flex;
+        flex-direction: row;
+    }
+    .tableBox-filtering {
+        display: flex;
+        flex-direction: row;
+        float: right;
+        margin-right: 10px;
+        .tableBox-filterAll {
+            min-width: 75px;
+        }
+    }
+}
+
+.tableBox-filterPopup {
+    background: $light-gray;
+    position: absolute;
+    min-width: 235px;
+    top: 60px;
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    z-index: 2;
+    padding: 7px;
+    border-radius: 5px;
+    margin: 3px;
+    .tableBox-filterPopup-selectColumn {
+        margin-top: 5px;
+        flex-direction: row;
+        .tableBox-filterPopup-selectColumn-each {
+            margin-left: 25px;
+            border-radius: 3px;
+            background: $light-gray;
+        }
+    }
+    .tableBox-filterPopup-setValue {
+        margin-top: 5px;
+        display: flex;
+        flex-direction: row;
+        .tableBox-filterPopup-setValue-each {
+            margin-right: 5px;
+            border-radius: 3px;
+            background: $light-gray;
+        }
+        .tableBox-filterPopup-setValue-input {
+            margin: 5px;
+        }
+    }
+    .tableBox-filterPopup-setFilter {
+        margin-top: 5px;
+        align-self: center;
+    }
 }