github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3989 from w33ble/fix/chart-height

Browse source 
Fix chart height in FF
This commit is contained in:
Khalah Jones Golden 2015-05-29 19:55:38 -04:00
commit b29d99121b
6 changed files with 25 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/kibana/components/vislib/styles/_legend.less
View file

@ -1,8 +1,6 @@
.legend-col-wrapper {
.flex(0 1 auto);
.flex-parent(0, 0, auto);
z-index: 10;
overflow-x: hidden;
overflow-y: auto;
min-height: 0;
.legend-toggle {
@ -26,11 +24,13 @@
}
.legend-ul {
.flex(1, 1, 1px);
overflow-x: hidden;
overflow-y: auto;
list-style-type: none;
padding: 0;
visibility: visible;
.display(flex);
.flex-direction(column);
min-height: 0;
min-width: 60px;
margin-right: 5px;
@ -44,7 +44,6 @@
color: #666;
cursor: default;
text-align: left;
.flex-grow(2);
white-space: nowrap;
overflow-x: hidden;
text-overflow: ellipsis;

16
src/kibana/plugins/markdown_vis/markdown_vis.less
View file

@ -10,20 +10,6 @@
&.vis-type-markdown {
.vis-editor-config {
.flex-parent();
> ul {
.flex-parent();
.flex(1, 1, auto);
li {
.flex-parent();
.flex(1, 1, auto);
}
}
}
.visualization-options {
.flex-parent();
.flex(1, 1, auto);
@ -42,4 +28,4 @@
}
}
}

4
src/kibana/plugins/visualize/editor/agg_group.html
View file

@ -1,4 +1,4 @@
<li class="sidebar-item">
<div class="sidebar-item">
<div class="sidebar-item-title">
{{ groupName }}
</div>
@ -19,4 +19,4 @@
<vis-editor-agg-add ng-if="stats.count === 0" class="vis-editor-agg-add"></vis-editor-agg-add>
</div>
</li>
</div>

18
src/kibana/plugins/visualize/editor/sidebar.html
View file

@ -51,22 +51,16 @@
</nav>
<div class="vis-editor-config" ng-show="sidebar.section == 'data'">
<ul class="list-unstyled">
<!-- metrics -->
<vis-editor-agg-group ng-if="vis.type.schemas.metrics" group-name="metrics"></vis-editor-agg-group>
<!-- metrics -->
<vis-editor-agg-group ng-if="vis.type.schemas.metrics" group-name="metrics"></vis-editor-agg-group>
<!-- buckets -->
<vis-editor-agg-group ng-if="vis.type.schemas.buckets" group-name="buckets"></vis-editor-agg-group>
</ul>
<!-- buckets -->
<vis-editor-agg-group ng-if="vis.type.schemas.buckets" group-name="buckets"></vis-editor-agg-group>
</div>
<div class="vis-editor-config" ng-show="sidebar.section == 'options'">
<ul class="list-unstyled">
<!-- vis options -->
<vis-editor-vis-options vis="vis"></vis-editor-vis-options>
</ul>
<!-- vis options -->
<vis-editor-vis-options vis="vis"></vis-editor-vis-options>
</div>

13
src/kibana/plugins/visualize/editor/styles/editor.less
View file

@ -91,8 +91,8 @@
.flex-parent(1, 1, auto);
> div.vis-editor-config {
.flex(1, 1, auto);
overflow-y: auto;
.flex-parent(1, 1, 1px);
overflow: auto;
}
> .vis-edit-sidebar-buttons {
@ -157,7 +157,7 @@
}
&-group {
.flex-parent();
.flex-parent(0, 1, auto);
color: @text-color;
}
@ -298,6 +298,10 @@
}
}
vis-editor-agg-group {
.flex-parent(0, 1, auto);
}
&-canvas {
.flex(1, 0, @screen-md-min - @vis-editor-sidebar-basis);
.display(flex);
@ -337,7 +341,8 @@ vis-editor-agg-group,
vis-editor-agg,
vis-editor-agg-params,
vis-editor-agg-param,
vis-editor-vis-options {
vis-editor-vis-options,
vis-editor-vis-options > * {
.flex-parent();
}

4
src/kibana/plugins/visualize/editor/vis_options.html
View file

@ -1,6 +1,6 @@
<li class="sidebar-item" ng-show="vis.type.params.editor">
<div class="sidebar-item" ng-show="vis.type.params.editor">
<div class="sidebar-item-title">
view options
</div>
<div class="visualization-options"></div>
</li>
</div>