Skip to content

Commit

Permalink
Merge pull request #2 from rashidkpc/pr/1783
Browse files Browse the repository at this point in the history
Tweak vis option styling, make section collapsed by default
  • Loading branch information
w33ble committed Nov 5, 2014
2 parents 3454842 + 3c1ea77 commit 2c76cdd
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 12 deletions.
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<div>
<div>
<div class="vis-option-item">
<label>
<input type="checkbox" ng-model="vis.params.addTooltip">
Show Tooltip
</label>
</div>
<div>
<div class="vis-option-item">
<label>
<input type="checkbox" ng-model="vis.params.addLegend">
Show Legend
Expand Down
3 changes: 1 addition & 2 deletions src/kibana/plugins/vis_types/vislib/editors/area.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<vislib-basic-options></vislib-basic-options>

<!-- vis type specific options -->
<div>
<label>
Chart Mode
<select ng-model="vis.params.mode" ng-options="mode for mode in vis.type.params.modes"></select>
</label>
</div>
<vislib-basic-options></vislib-basic-options>
8 changes: 4 additions & 4 deletions src/kibana/plugins/vis_types/vislib/editors/histogram.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<vislib-basic-options></vislib-basic-options>

<!-- vis type specific options -->
<div>
<div class="vis-option-item form-group">
<label>
Bar Mode
<select ng-model="vis.params.mode" ng-options="mode for mode in vis.type.params.modes"></select>
</label>
<select class="form-control" ng-model="vis.params.mode" ng-options="mode for mode in vis.type.params.modes"></select>
</div>

<vislib-basic-options></vislib-basic-options>
5 changes: 4 additions & 1 deletion src/kibana/plugins/visualize/editor/styles/editor.less
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,10 @@

.visualization-options {
padding: @vis-editor-agg-editor-spacing;
padding-left: @vis-editor-agg-editor-spacing * 4;

.form-group {
margin-bottom: 5px;
}
}

nesting-indicator {
Expand Down
7 changes: 4 additions & 3 deletions src/kibana/plugins/visualize/editor/vis_options.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<li class="sidebar-item">
<div class="sidebar-item-title">
visualization options
<div class="sidebar-item-title" ng-click="showVisOptions = !showVisOptions">
view options
<i class="fa fa-caret-down" ng-class="{'fa-caret-down': showVisOptions, 'fa-caret-right': !showVisOptions}"></i>
</div>

<div class="visualization-options"></div>
<div class="visualization-options" ng-show="!!showVisOptions"></div>
</li>

0 comments on commit 2c76cdd

Please sign in to comment.