Merge pull request #2556 from jthomassie/fix/firefox-flex

Fix/firefox-flex
elastic · Jan 7, 2015 · b67edbe · b67edbe
2 parents b2d8172 + 4c136bd
commit b67edbe
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 4 deletions.
diff --git a/src/kibana/components/vislib/styles/_layout.less b/src/kibana/components/vislib/styles/_layout.less
@@ -3,25 +3,33 @@
 .visualize-chart {
   .display(flex);
   .flex(1 1 100%);
+  min-height: 0;
+  min-width: 0;
 }
 
 .vis-wrapper {
   .display(flex);
   .flex(1 1 100%);
   .flex-direction(row);
-  margin: 10px 0 0 6px;
+  // margin: 10px 0 0 6px;
+  min-height: 0;
+  min-width: 0;
 }
 
 /* YAxis logic */
 .y-axis-col-wrapper {
   .display(flex);
   .flex-direction(column);
+  min-height: 0;
+  min-width: 0;
 }
 
 .y-axis-col {
   .display(flex);
   .flex-direction(row);
   .flex(1 0 36px);
+  min-height: 0;
+  min-width: 0;
 }
 
 .y-axis-spacer-block {
@@ -33,6 +41,7 @@
   .flex-direction(column);
   width: 38px;
   min-height: 20px;
+  min-width: 0;
 }
 
 .y-axis-div {
@@ -50,6 +59,7 @@
   .display(flex);
   .flex-direction(column);
   min-height: 14px;
+  min-width: 0;
   width: 14px;
 }
 
@@ -72,29 +82,39 @@
   .display(flex);
   .flex(1 0 20px);
   .flex-direction(column);
+  min-height: 0;
+  min-width: 0;
 }
 
 .chart-wrapper {
   .display(flex);
   .flex(1 0 20px);
   overflow: visible;
   margin: 0 5px 0 0;
+  min-height: 0;
+  min-width: 0;
 }
 
 .chart-wrapper-column {
   .display(flex);
   .flex(1 0 20px);
   .flex-direction(row);
+  min-height: 0;
+  min-width: 0;
 }
 
 .chart-wrapper-row {
   .display(flex);
   .flex-direction(column);
-  .flex(1 0 100%);
+  .flex(1 1 100%);
+  min-height: 0;
+  min-width: 0;
 }
 
 .chart {
   .flex(1 1 100%);
+  min-height: 0;
+  min-width: 0;
 
   > svg {
     display: block;
@@ -105,23 +125,29 @@
 
 .chart-row {
   .flex(1 1 auto);
+  min-height: 0;
+  min-width: 0;
 }
 
 .chart-column {
   .flex(1 1 auto);
+  min-height: 0;
+  min-width: 0;
 }
 
 .x-axis-wrapper {
   .display(flex);
   .flex-direction(column);
   min-height: 45px;
+  min-width: 0;
   overflow: visible;
 }
 
 .x-axis-div-wrapper {
   .display(flex);
   .flex-direction(row);
   min-height: 15px;
+  min-width: 0;
 }
 
 .x-axis-chart-title {

diff --git a/src/kibana/components/vislib/styles/_legend.less b/src/kibana/components/vislib/styles/_legend.less
@@ -6,6 +6,7 @@
   overflow-x: hidden;
   overflow-y: auto;
   min-width: 40px;
+  min-height: 0;
 
   .header {
     width: 100%;
@@ -21,6 +22,8 @@
     visibility: visible;
     .display(flex);
     .flex-direction(column);
+    min-height: 0;
+    min-width: 0;
 
     li.color {
       min-height: 22px;

diff --git a/src/kibana/plugins/visualize/editor/styles/editor.less b/src/kibana/plugins/visualize/editor/styles/editor.less
@@ -264,11 +264,11 @@
 
     visualize {
       .flex-parent();
-      .flex(1, 0, auto);
+      .flex(1, 1, 100%);
     }
 
     .visualize-chart {
-      .flex(1, 0, 100%);
+      .flex(1, 1, 100%);
       position: relative;
     }
   }