Merge pull request #2 from spenceralger/feature/logo-in-header

[dashboard] unwrap the navbar to prevent minor style issue
spalger · Feb 6, 2015 · d83fe05 · d83fe05
2 parents af3c179 + 15e645b
commit d83fe05
Showing 1 changed file with 42 additions and 44 deletions.
diff --git a/src/kibana/plugins/dashboard/index.html b/src/kibana/plugins/dashboard/index.html
@@ -1,51 +1,49 @@
 <div dashboard-app class="app-container dashboard-container">
-  <nav ng-show="!appEmbedded" class="navbar navbar-default navbar-static-top">
-    <navbar>
-      <span class="name" ng-if="dash.id" bindonce bo-bind="dash.title" tooltip="{{dash.title}}"></span>
-
-      <form name="queryInput"
-        class="fill inline-form"
-        ng-submit="filterResults()">
-
-        <div class="typeahead" kbn-typeahead="dashboard">
-          <div class="input-group"
-            ng-class="queryInput.$invalid ? 'has-error' : ''">
-
-            <input type="text" input-focus
-              placeholder="Filter..."
-              class="form-control"
-              ng-model="state.query"
-              kbn-typeahead-input
-              validate-query>
-            <button type="submit" class="btn btn-default" ng-disabled="queryInput.$invalid">
-              <span class="fa fa-search"></span>
-            </button>
-          </div>
-
-          <kbn-typeahead-items></kbn-typeahead-items>
+  <navbar ng-show="!appEmbedded">
+    <span class="name" ng-if="dash.id" bindonce bo-bind="dash.title" tooltip="{{dash.title}}"></span>
+
+    <form name="queryInput"
+      class="fill inline-form"
+      ng-submit="filterResults()">
+
+      <div class="typeahead" kbn-typeahead="dashboard">
+        <div class="input-group"
+          ng-class="queryInput.$invalid ? 'has-error' : ''">
+
+          <input type="text" input-focus
+            placeholder="Filter..."
+            class="form-control"
+            ng-model="state.query"
+            kbn-typeahead-input
+            validate-query>
+          <button type="submit" class="btn btn-default" ng-disabled="queryInput.$invalid">
+            <span class="fa fa-search"></span>
+          </button>
         </div>
 
-      </form>
-
-      <div class="button-group">
-        <kbn-tooltip text="New Dashboard" placement="bottom" append-to-body="1">
-          <button ng-click="newDashboard()"><i class="fa fa-file-new-o"></i></button>
-        </kbn-tooltip>
-        <kbn-tooltip text="Save Dashboard" placement="bottom" append-to-body="1">
-          <button ng-click="configTemplate.toggle('save')"><i class="fa fa-save"></i></button>
-        </kbn-tooltip>
-        <kbn-tooltip text="Load Saved Dashboard" placement="bottom" append-to-body="1">
-          <button ng-click="configTemplate.toggle('load')"><i class="fa fa-folder-open-o"></i></button>
-        </kbn-tooltip>
-        <kbn-tooltip text="Share" placement="bottom" append-to-body="1">
-          <button ng-click="configTemplate.toggle('share')"><i class="fa fa-external-link"></i></button>
-        </kbn-tooltip>
-        <kbn-tooltip text="Add Visualization" placement="bottom" append-to-body="1">
-          <button ng-click="configTemplate.toggle('pickVis')"><i class="fa fa-plus-circle"></i></button>
-        </kbn-tooltip>
+        <kbn-typeahead-items></kbn-typeahead-items>
       </div>
-    </navbar>
-  </nav>
+
+    </form>
+
+    <div class="button-group">
+      <kbn-tooltip text="New Dashboard" placement="bottom" append-to-body="1">
+        <button ng-click="newDashboard()"><i class="fa fa-file-new-o"></i></button>
+      </kbn-tooltip>
+      <kbn-tooltip text="Save Dashboard" placement="bottom" append-to-body="1">
+        <button ng-click="configTemplate.toggle('save')"><i class="fa fa-save"></i></button>
+      </kbn-tooltip>
+      <kbn-tooltip text="Load Saved Dashboard" placement="bottom" append-to-body="1">
+        <button ng-click="configTemplate.toggle('load')"><i class="fa fa-folder-open-o"></i></button>
+      </kbn-tooltip>
+      <kbn-tooltip text="Share" placement="bottom" append-to-body="1">
+        <button ng-click="configTemplate.toggle('share')"><i class="fa fa-external-link"></i></button>
+      </kbn-tooltip>
+      <kbn-tooltip text="Add Visualization" placement="bottom" append-to-body="1">
+        <button ng-click="configTemplate.toggle('pickVis')"><i class="fa fa-plus-circle"></i></button>
+      </kbn-tooltip>
+    </div>
+  </navbar>
 
   <config config-template="configTemplate" config-object="opts"></config>