Skip to content

Agg buttons #2799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lukasolson merged 2 commits into from
Jan 29, 2015
Merged

Agg buttons #2799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5979158
move buttons out of ul
w33ble Jan 28, 2015
7403e99
fix styles, use flexbox
w33ble Jan 28, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 22 additions & 21 deletions src/kibana/plugins/visualize/editor/sidebar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,27 @@
</vis-editor-vis-options>

<!-- apply/discard -->
<li class="vis-editor-sidebar-buttons sidebar-item">
<p
ng-if="visualizeEditor.$invalid"
class="text-center text-danger sidebar-item-text">
<i class="fa fa-warning"></i> {{visualizeEditor.describeErrors()}}
</p>
<button
ng-disabled="!vis.dirty || visualizeEditor.$invalid"
type="submit"
class="sidebar-item-button success">
Apply
</button>
<button
ng-disabled="!vis.dirty"
type="button"
ng-click="resetEditableVis()"
class="sidebar-item-button default">
Discard
</button>
</li>
</ul>
<div class="vis-editor-sidebar-buttons">
<p
ng-if="visualizeEditor.$invalid"
class="text-center text-danger sidebar-item-text">
<i class="fa fa-warning"></i> {{visualizeEditor.describeErrors()}}
</p>
<button
ng-disabled="!vis.dirty || visualizeEditor.$invalid"
type="submit"
class="sidebar-item-button success">
Apply
</button>
<button
ng-disabled="!vis.dirty"
type="button"
ng-click="resetEditableVis()"
class="sidebar-item-button default">
Discard
</button>
</div>
</form>
</div>
</div>

27 changes: 16 additions & 11 deletions src/kibana/plugins/visualize/editor/styles/editor.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,33 +50,38 @@
&-sidebar {
.flex-parent(0, 0, auto);

overflow: auto;
// overflow: auto;

// overrided for tablet and desktop
@media (min-width: @screen-md-min) {
.flex-basis(@vis-editor-sidebar-basis);
min-width: @vis-editor-sidebar-min-width;
max-width: @vis-editor-sidebar-min-width;
margin-bottom: (@input-height-base * 2) - 3;
// margin-bottom: (@input-height-base * 2) - 3;
}

&-buttons {
// overrides for tablet and desktop
@media (min-width: @screen-md-min) {
position: absolute;
bottom: 0;
min-width: @vis-editor-sidebar-min-width;
}
}

.sidebar-item {
border-top: 0 !important;
}

.sidebar-container {
.flex(1, 0, auto);
.flex-parent(1, 1, auto);
background-color: @body-bg;
border-right-color: @sidebar-bg;

form {
.flex-parent(1, 1, auto);

> ul {
.flex(1, 1, auto);
overflow-y: auto;
}

> .vis-edit-sidebar-buttons {
.flex(0, 0, auto)
}
}
}

.sidebar-item-title {
Expand Down