Skip to content

Commit

Permalink
Merge pull request #4686 from spalger/style/navInlineForm
Browse files Browse the repository at this point in the history
[navbar] allow inline forms that do not fill
  • Loading branch information
jbudz committed Aug 18, 2015
2 parents ce19ecc + 5288129 commit 9bfa645
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions src/plugins/kibana/public/visualize/editor/editor.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<i aria-hidden="true" class="fa fa-chain-broken"></i> Unlinked!
</div>

<form ng-if="vis.type.requiresSearch && $state.linked" class="inline-form" name="queryInput">
<form ng-if="vis.type.requiresSearch && $state.linked" class="inline-form fill" name="queryInput">
<div class="typeahead">
<div class="input-group">
<input
Expand All @@ -39,7 +39,7 @@
<form
ng-if="vis.type.requiresSearch && !$state.linked"
ng-submit="fetch()"
class="inline-form"
class="inline-form fill"
name="queryInput">
<div class="typeahead" kbn-typeahead="visualize">
<div class="input-group"
Expand Down
12 changes: 6 additions & 6 deletions src/ui/public/styles/control_group.less
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,6 @@
}
}

// the element should take up an even share of available space
> .fill {
flex: 1 1 1%;
}

button {
padding: @padding-base-vertical @padding-base-horizontal;
font-size: @font-size-base;
Expand Down Expand Up @@ -79,7 +74,7 @@
}

.inline-form {
.flex-parent();
.flex-parent(0, 0, auto);
display: flex;

> .typeahead {
Expand All @@ -102,6 +97,11 @@
}
}
}

// the element should take up an even share of available space
> .fill {
flex: 1 1 1%;
}
}

.nav-controls .column {
Expand Down

0 comments on commit 9bfa645

Please sign in to comment.