Merge branch 'master' into fix/elastic#2297

stormpython · Dec 13, 2014 · d9a0363 · d9a0363
2 parents 566e60d + 3cac440
commit d9a0363
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 19 deletions.
diff --git a/src/kibana/components/vislib/lib/x_axis.js b/src/kibana/components/vislib/lib/x_axis.js
@@ -232,24 +232,13 @@ define(function (require) {
       var text;
       var barWidth = self.xScale.rangeBand();
       var maxRotatedLength = 180;
-      var textWidth = 0;
       var xAxisPadding = 15;
       var svg;
-      var xAxisLabelHt = 15;
       var lengths = [];
       var length;
       self._attr.isRotated = false;
 
       return function (selection) {
-
-        // maxRotatedLength = min of 60% chart height or maxRotatedLength
-        var chtWrap = d3.select(this.node().parentNode.parentNode.parentNode).select('.chart-wrapper');
-        if (chtWrap) {
-          var chtWrapHt = chtWrap.style('height');
-          chtWrapHt = 0.6 * +chtWrapHt.substring(0, chtWrapHt.length - 2);
-          maxRotatedLength = _.min([maxRotatedLength, chtWrapHt]);
-        }
-
         text = selection.selectAll('.tick text');
 
         text.each(function textWidths() {

diff --git a/src/kibana/components/vislib/styles/_layout.less b/src/kibana/components/vislib/styles/_layout.less
@@ -104,11 +104,11 @@
 }
 
 .chart-row {
-  .flex(1 1);
+  .flex(1 1 auto);
 }
 
 .chart-column {
-  .flex(1 1);
+  .flex(1 1 auto);
 }
 
 .x-axis-wrapper {

diff --git a/src/kibana/components/visualize/visualize.less b/src/kibana/components/visualize/visualize.less
@@ -16,7 +16,7 @@ visualize {
   }
 
   .visualize-chart {
-    .flex(1, 1);
+    .flex(1 1 auto);
     overflow: auto;
 
     &.spy-visible {
@@ -85,7 +85,7 @@ visualize-spy {
     }
 
     > .alert {
-      .flex(0 0 auto);
+      .flex(0, 0, auto);
     }
 
     tr > td {

diff --git a/src/kibana/plugins/visualize/editor/styles/editor.less b/src/kibana/plugins/visualize/editor/styles/editor.less
@@ -119,7 +119,7 @@
     &-header {
       .display(flex);
       .align-items(center);
-      .flex(1);
+      .flex(1, 0, auto);
 
       &-toggle {
         .flex(0, 0, auto);

diff --git a/src/kibana/styles/_control_group.less b/src/kibana/styles/_control_group.less
@@ -75,9 +75,28 @@
     }
   }
 
-  .inline-form .input-group {
-    input {
-      height: auto;
+  .inline-form {
+    .flex-parent();
+    .display(flex);
+
+    > .typeahead {
+      .flex-parent();
+
+      > .input-group {
+        .display(flex);
+        .flex(1, 0, auto);
+
+        > * {
+          float: none;
+          height: auto;
+          width: auto;
+          .flex(0 0 auto);
+        }
+
+        [validate-query] {
+          .flex(1 1 100%);
+        }
+      }
     }
   }
 }