Merge pull request #2185 from kocsmy/design/new-data-source+query-editor

Design/new data source+query editor
getredash · Jan 18, 2018 · c2e28b2 · c2e28b2
2 parents dcf867e + 11cfc66
commit c2e28b2
Show file tree

Hide file tree

Showing 70 changed files with 1,319 additions and 412 deletions.
diff --git a/client/app/assets/images/db-logos/athena.png b/client/app/assets/images/db-logos/athena.png
diff --git a/client/app/assets/images/db-logos/axibasetsd.png b/client/app/assets/images/db-logos/axibasetsd.png
diff --git a/client/app/assets/images/db-logos/bigquery.png b/client/app/assets/images/db-logos/bigquery.png
diff --git a/client/app/assets/images/db-logos/clickhouse.png b/client/app/assets/images/db-logos/clickhouse.png
diff --git a/client/app/assets/images/db-logos/cockroach.png b/client/app/assets/images/db-logos/cockroach.png
diff --git a/client/app/assets/images/db-logos/dynamodb_sql.png b/client/app/assets/images/db-logos/dynamodb_sql.png
diff --git a/client/app/assets/images/db-logos/elasticsearch.png b/client/app/assets/images/db-logos/elasticsearch.png
diff --git a/client/app/assets/images/db-logos/google_analytics.png b/client/app/assets/images/db-logos/google_analytics.png
diff --git a/client/app/assets/images/db-logos/google_spreadsheets.png b/client/app/assets/images/db-logos/google_spreadsheets.png
diff --git a/client/app/assets/images/db-logos/graphite.png b/client/app/assets/images/db-logos/graphite.png
diff --git a/client/app/assets/images/db-logos/hive.png b/client/app/assets/images/db-logos/hive.png
diff --git a/client/app/assets/images/db-logos/impala.png b/client/app/assets/images/db-logos/impala.png
diff --git a/client/app/assets/images/db-logos/influxdb.png b/client/app/assets/images/db-logos/influxdb.png
diff --git a/client/app/assets/images/db-logos/jirajql.png b/client/app/assets/images/db-logos/jirajql.png
diff --git a/client/app/assets/images/db-logos/kibana.png b/client/app/assets/images/db-logos/kibana.png
diff --git a/client/app/assets/images/db-logos/memsql.png b/client/app/assets/images/db-logos/memsql.png
diff --git a/client/app/assets/images/db-logos/mongodb.png b/client/app/assets/images/db-logos/mongodb.png
diff --git a/client/app/assets/images/db-logos/mssql.png b/client/app/assets/images/db-logos/mssql.png
diff --git a/client/app/assets/images/db-logos/mysql.png b/client/app/assets/images/db-logos/mysql.png
diff --git a/client/app/assets/images/db-logos/pg.png b/client/app/assets/images/db-logos/pg.png
diff --git a/client/app/assets/images/db-logos/presto.png b/client/app/assets/images/db-logos/presto.png
diff --git a/client/app/assets/images/db-logos/rds_mysql.png b/client/app/assets/images/db-logos/rds_mysql.png
diff --git a/client/app/assets/images/db-logos/redshift.png b/client/app/assets/images/db-logos/redshift.png
diff --git a/client/app/assets/images/db-logos/results.png b/client/app/assets/images/db-logos/results.png
diff --git a/client/app/assets/images/db-logos/salesforce.png b/client/app/assets/images/db-logos/salesforce.png
diff --git a/client/app/assets/images/db-logos/sqlite.png b/client/app/assets/images/db-logos/sqlite.png
diff --git a/client/app/assets/images/db-logos/treasuredata.png b/client/app/assets/images/db-logos/treasuredata.png
diff --git a/client/app/assets/images/db-logos/url.png b/client/app/assets/images/db-logos/url.png
diff --git a/client/app/assets/images/db-logos/vertica.png b/client/app/assets/images/db-logos/vertica.png
diff --git a/client/app/assets/images/destinations/email.png b/client/app/assets/images/destinations/email.png
diff --git a/client/app/assets/images/destinations/hipchat.png b/client/app/assets/images/destinations/hipchat.png
diff --git a/client/app/assets/images/destinations/slack.png b/client/app/assets/images/destinations/slack.png
diff --git a/client/app/assets/images/destinations/webhook.png b/client/app/assets/images/destinations/webhook.png
diff --git a/client/app/assets/less/inc/edit-in-place.less b/client/app/assets/less/inc/edit-in-place.less
@@ -1,13 +1,18 @@
 .edit-in-place span {
   white-space: pre-line;
+
+  p {
+    margin-bottom: 0;
+  }
 }
 
 .edit-in-place span.editable {
   cursor: pointer;
 }
 
 .edit-in-place span.editable:hover {
-  background: #FCFCA2;
+  background: @redash-yellow;
+  border-radius: @redash-radius;
 }
 
 .edit-in-place input,
@@ -24,3 +29,35 @@
   display: inline-block;
 }
 
+.edit-in-place {
+  display: inline-block;
+}
+
+.edit-in-place {
+  .rd-form-control {
+    padding: 0px 6px;
+    width: 30vw;
+  }
+
+  &.active {
+    textarea.rd-form-control {
+      height: 29px;
+      width: 40vw;
+    }
+  }
+}
+
+
+@media (max-width: 880px) {
+  .edit-in-place {
+    .rd-form-control {
+      width: 50vw;
+    }
+
+    &.active {
+      textarea.rd-form-control {
+        width: 50vw;
+      }
+    }
+  }
+}
diff --git a/client/app/assets/less/inc/form.less b/client/app/assets/less/inc/form.less
@@ -10,8 +10,8 @@ textarea.v-resizable {
   &.required {
     .control-label {
       &:after {
-        content: "*";
-        color: red;
+        content: " *";
+        color: inherit;
       }
     }
   }