Skip to content

Commit 7f7ea67

Browse files
author
Rashid Khan
committed
float the apple/discard buttons at the bottom. Closes #420
1 parent 3077ace commit 7f7ea67

File tree

4 files changed

+24
-9
lines changed

4 files changed

+24
-9
lines changed

src/kibana/apps/visualize/editor/editor.less

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
.vis-editor {
22
.flex-parent();
33

4+
@vis-editor-sidebar-basis: (100/12) * 2%; // two of twelve columns
5+
@vis-editor-sidebar-min-width: 350px;
6+
@vis-editor-nesting-width: 8px;
7+
@vis-editor-agg-editor-spacing: 5px;
8+
49
navbar {
510
.bitty-modal-container {
611
position: relative;
@@ -39,6 +44,20 @@
3944
@media (min-width: @screen-md-min) {
4045
.flex-basis(@vis-editor-sidebar-basis);
4146
min-width: @vis-editor-sidebar-min-width;
47+
margin-bottom: (@input-height-base * 2) - 3;
48+
}
49+
50+
&-buttons {
51+
// overrides for tablet and desktop
52+
@media (min-width: @screen-md-min) {
53+
position: absolute;
54+
bottom: 0;
55+
min-width: @vis-editor-sidebar-min-width;
56+
}
57+
}
58+
59+
.sidebar-item {
60+
border-top: 0 !important;
4261
}
4362

4463
.sidebar-container {
@@ -79,7 +98,6 @@
7998
&-group {
8099
.flex-parent();
81100
color: @text-color;
82-
margin-bottom: 10px;
83101
}
84102

85103
&-header {

src/kibana/apps/visualize/editor/sidebar.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,15 @@
2929
</vis-editor-agg-group>
3030

3131
<!-- apply/discard -->
32-
<li class="sidebar-item" ng-if="vis.dirty">
32+
<li class="vis-editor-sidebar-buttons sidebar-item">
3333
<button
34+
ng-disabled="!vis.dirty"
3435
type="submit"
3536
class="sidebar-item-button success">
3637
Apply
3738
</button>
3839
<button
40+
ng-disabled="!vis.dirty"
3941
type="button"
4042
ng-click="reset()"
4143
class="sidebar-item-button warn">

src/kibana/apps/visualize/styles/main.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919
font-size: 1.2em;
2020
}
2121

22-
@import "../editor/editor.less";
22+
@import "../editor/editor.less";

src/kibana/styles/_variables.less

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,4 @@
1616
@sidebar-active-color: @component-active-color;
1717
@sidebar-active-bg: @component-active-bg;
1818
@sidebar-active-hover-bg: @component-active-bg;
19-
@sidebar-active-hover-color: @component-active-color;
20-
21-
@vis-editor-sidebar-basis: (100/12) * 2%; // two of twelve columns
22-
@vis-editor-sidebar-min-width: 350px;
23-
@vis-editor-nesting-width: 8px;
24-
@vis-editor-agg-editor-spacing: 5px;
19+
@sidebar-active-hover-color: @component-active-color;

0 commit comments

Comments
 (0)