Merge branch 'master' of github.com:elastic/kibana into fix/webpack-l…

…oader-query-strings
elastic · Dec 15, 2016 · bcaf446 · bcaf446
2 parents 4969d66 + 2f93b18
commit bcaf446
Show file tree

Hide file tree

Showing 114 changed files with 1,930 additions and 777 deletions.
diff --git a/src/core_plugins/console/public/src/directives/help.html b/src/core_plugins/console/public/src/directives/help.html
@@ -1,4 +1,4 @@
-<div class="localDropdownTitle">Help</div>
+<div class="kuiLocalDropdownTitle">Help</div>
 
 <tabset>
   <tab heading="Request format">

diff --git a/src/core_plugins/console/public/src/directives/history.html b/src/core_plugins/console/public/src/directives/history.html
@@ -1,4 +1,4 @@
-<div class="localDropdownTitle">History</div>
+<div class="kuiLocalDropdownTitle">History</div>
 
 <div class="history-body">
   <ul class="list-group history-reqs">

diff --git a/src/core_plugins/console/public/src/directives/settings.html b/src/core_plugins/console/public/src/directives/settings.html
@@ -1,9 +1,9 @@
-<div class="localDropdownTitle">Settings</div>
+<div class="kuiLocalDropdownTitle">Settings</div>
 
 <form class="form" name="settingsForm" ng-submit="settingsForm.$valid && settings.apply()">
   <div class="form-group">
-    <div class="localDropdownHeader">
-      <div class="localDropdownHeader__label">Font Size</div>
+    <div class="kuiLocalDropdownHeader">
+      <div class="kuiLocalDropdownHeader__label">Font Size</div>
     </div>
 
     <div>
@@ -27,8 +27,8 @@
   </div>
 
   <div class="form-group">
-    <div class="localDropdownHeader">
-      <div class="localDropdownHeader__label">Autocomplete</div>
+    <div class="kuiLocalDropdownHeader">
+      <div class="kuiLocalDropdownHeader__label">Autocomplete</div>
     </div>
 
     <div class="checkbox">

diff --git a/src/core_plugins/console/public/src/directives/welcome.html b/src/core_plugins/console/public/src/directives/welcome.html
@@ -1,4 +1,4 @@
-<div class="localDropdownTitle">Welcome to Console</div>
+<div class="kuiLocalDropdownTitle">Welcome to Console</div>
 
 <p><strong>Quick intro to the UI</strong></p>
 

diff --git a/src/core_plugins/kibana/public/dashboard/index.html b/src/core_plugins/kibana/public/dashboard/index.html
@@ -6,7 +6,7 @@
       <!-- Title. -->
       <div
         data-transclude-slot="topLeftCorner"
-        class="localTitle"
+        class="kuiLocalTitle"
       >
         <span
           ng-show="dash.id"
@@ -24,7 +24,7 @@
         ng-submit="filterResults()"
       >
         <div class="typeahead" kbn-typeahead="dashboard">
-          <div class="localSearch">
+          <div class="kuiLocalSearch">
             <input
               parse-query
               input-focus
@@ -33,13 +33,13 @@
               placeholder="Filter..."
               aria-label="Filter input"
               type="text"
-              class="localSearchInput"
-              ng-class="{'localSearchInput-isInvalid': queryInput.$invalid}"
+              class="kuiLocalSearchInput"
+              ng-class="{'kuiLocalSearchInput-isInvalid': queryInput.$invalid}"
             >
             <button
               type="submit"
               aria-label="Filter Dashboards"
-              class="localSearchButton"
+              class="kuiLocalSearchButton"
               ng-disabled="queryInput.$invalid"
             >
               <span class="fa fa-search" aria-hidden="true"></span>

diff --git a/src/core_plugins/kibana/public/dashboard/partials/load_dashboard.html b/src/core_plugins/kibana/public/dashboard/partials/load_dashboard.html
@@ -1,2 +1,2 @@
-<div class="localDropdownTitle">Open Dashboard</div>
+<div class="kuiLocalDropdownTitle">Open Dashboard</div>
 <saved-object-finder type="dashboards"></saved-object-finder>
diff --git a/src/core_plugins/kibana/public/dashboard/partials/options.html b/src/core_plugins/kibana/public/dashboard/partials/options.html
@@ -1,5 +1,5 @@
 <form role="form">
-  <div class="localDropdownTitle">Options</div>
+  <div class="kuiLocalDropdownTitle">Options</div>
   <div class="input-group">
     <label>
       <input type="checkbox" ng-model="opts.ui.darkTheme" ng-checked="opts.ui.darkTheme">

diff --git a/src/core_plugins/kibana/public/dashboard/partials/pick_visualization.html b/src/core_plugins/kibana/public/dashboard/partials/pick_visualization.html
@@ -2,7 +2,7 @@
   ng-switch="mode"
   ng-init="mode = 'visualization'"
 >
-  <div class="localDropdownTitle">Add Panels</div>
+  <div class="kuiLocalDropdownTitle">Add Panels</div>
 
   <ul class="nav nav-tabs">
     <li ng-class="{active: mode == 'visualization'}">

diff --git a/src/core_plugins/kibana/public/dashboard/partials/save_dashboard.html b/src/core_plugins/kibana/public/dashboard/partials/save_dashboard.html
@@ -2,9 +2,9 @@
   role="form"
   ng-submit="opts.save()"
 >
-  <div class="localDropdownTitle">Save {{opts.dashboard.getDisplayName()}}</div>
+  <div class="kuiLocalDropdownTitle">Save {{opts.dashboard.getDisplayName()}}</div>
   <input
-    class="localDropdownInput"
+    class="kuiLocalDropdownInput"
     id="dashboardTitle"
     type="text"
     ng-model="opts.dashboard.title"

diff --git a/src/core_plugins/kibana/public/dev_tools/partials/dev_tools_app.html b/src/core_plugins/kibana/public/dev_tools/partials/dev_tools_app.html
@@ -9,11 +9,11 @@
       ></bread-crumbs>
 
       <!-- Tabs. -->
-      <div data-transclude-slot="bottomRow" class="localTabs">
+      <div data-transclude-slot="bottomRow" class="kuiLocalTabs">
         <a
           ng-repeat="item in kbnDevToolsApp.devTools"
-          class="localTab"
-          ng-class="{'localTab-isSelected': kbnDevToolsApp.currentPath === item.url}"
+          class="kuiLocalTab"
+          ng-class="{'kuiLocalTab-isSelected': kbnDevToolsApp.currentPath === item.url}"
           kbn-href="{{::item.url}}"
         >
           {{::item.display}}

diff --git a/src/core_plugins/kibana/public/discover/index.html b/src/core_plugins/kibana/public/discover/index.html
@@ -4,13 +4,13 @@
     <!-- Transcluded elements. -->
     <div data-transclude-slots>
       <!-- Breadcrumbs. -->
-      <div data-transclude-slot="topLeftCorner" class="localBreadcrumbs">
-        <div class="localBreadcrumb">
-          <span ng-show="opts.savedSearch.id" class="localBreadcrumb__emphasis">
+      <div data-transclude-slot="topLeftCorner" class="kuiLocalBreadcrumbs">
+        <div class="kuiLocalBreadcrumb">
+          <span ng-show="opts.savedSearch.id" class="kuiLocalBreadcrumb__emphasis">
             <span data-test-subj="discoverCurrentQuery" ng-bind="opts.savedSearch.lastSavedTitle"></span>
             <i aria-label="Reload Saved Search" tooltip="Reload Saved Search" ng-click="resetQuery();" class="fa fa-undo small"></i>&nbsp;
           </span>
-          <span data-test-subj="discoverQueryHits" class="localBreadcrumb__emphasis">{{(hits || 0) | number:0}}</span>
+          <span data-test-subj="discoverQueryHits" class="kuiLocalBreadcrumb__emphasis">{{(hits || 0) | number:0}}</span>
           <ng-pluralize count="hits" when="{'1':'hit', 'other':'hits'}"></ng-pluralize>
         </div>
       </div>
@@ -24,7 +24,7 @@
         ng-submit="fetch()"
       >
         <div class="typeahead" kbn-typeahead="discover">
-          <div class="localSearch">
+          <div class="kuiLocalSearch">
             <input
               parse-query
               input-focus
@@ -33,13 +33,13 @@
               placeholder="Search..."
               aria-label="Search input"
               type="text"
-              class="localSearchInput"
-              ng-class="{'localSearchInput-isInvalid': discoverSearch.$invalid}"
+              class="kuiLocalSearchInput"
+              ng-class="{'kuiLocalSearchInput-isInvalid': discoverSearch.$invalid}"
             >
             <button
               type="submit"
               aria-label="Search"
-              class="localSearchButton"
+              class="kuiLocalSearchButton"
               ng-disabled="discoverSearch.$invalid"
             >
               <span class="fa fa-search" aria-hidden="true"></span>

diff --git a/src/core_plugins/kibana/public/discover/partials/load_search.html b/src/core_plugins/kibana/public/discover/partials/load_search.html
@@ -1,4 +1,4 @@
 <form role="form" ng-submit="fetch()">
-  <div class="localDropdownTitle">Open Search</div>
+  <div class="kuiLocalDropdownTitle">Open Search</div>
   <saved-object-finder type="searches"></saved-object-finder>
 </form>
diff --git a/src/core_plugins/kibana/public/discover/partials/save_search.html b/src/core_plugins/kibana/public/discover/partials/save_search.html
@@ -2,9 +2,9 @@
   role="form"
   ng-submit="opts.saveDataSource()"
 >
-  <div class="localDropdownTitle">Save Search</div>
+  <div class="kuiLocalDropdownTitle">Save Search</div>
   <input
-    class="localDropdownInput"
+    class="kuiLocalDropdownInput"
     id="SaveSearch"
     ng-model="opts.savedSearch.title"
     input-focus="select"

diff --git a/src/core_plugins/kibana/public/management/app.html b/src/core_plugins/kibana/public/management/app.html
@@ -10,15 +10,15 @@
       ></bread-crumbs>
 
       <!-- Tabs. -->
-      <div data-transclude-slot="bottomRow" class="localTabs">
-        <span ng-if="!sectionName" class="localTab">
+      <div data-transclude-slot="bottomRow" class="kuiLocalTabs">
+        <span ng-if="!sectionName" class="kuiLocalTab">
           {{::section.display}}
         </span>
         <a
           ng-if="sectionName"
           ng-repeat="item in section.items.inOrder"
-          class="localTab"
-          ng-class="{ 'localTab-isSelected': item.active, 'localTab-disabled': !item.url }"
+          class="kuiLocalTab"
+          ng-class="{ 'kuiLocalTab-isSelected': item.active, 'kuiLocalTab-disabled': !item.url }"
           kbn-href="{{::item.url}}"
           data-test-subj="{{::item.name}}"
           tooltip="{{::item.tooltip}}"

diff --git a/src/core_plugins/kibana/public/visualize/editor/editor.html b/src/core_plugins/kibana/public/visualize/editor/editor.html
@@ -6,7 +6,7 @@
       <!-- Title. -->
       <div
         data-transclude-slot="topLeftCorner"
-        class="localTitle"
+        class="kuiLocalTitle"
       >
         <span
           ng-show="savedVis.id"
@@ -41,21 +41,21 @@
           class="fullWidth"
         >
           <div class="typeahead" kbn-typeahead="visualize">
-            <div class="localSearch">
+            <div class="kuiLocalSearch">
               <input
                 ng-model="state.query"
                 parse-query
                 input-focus
                 kbn-typeahead-input
                 placeholder="Search..."
                 type="text"
-                class="localSearchInput"
-                ng-class="{'localSearchInput-isInvalid': queryInput.$invalid}"
+                class="kuiLocalSearchInput"
+                ng-class="{'kuiLocalSearchInput-isInvalid': queryInput.$invalid}"
               >
               <button
                 type="submit"
                 aria-label="Search"
-                class="localSearchButton"
+                class="kuiLocalSearchButton"
                 ng-disabled="queryInput.$invalid"
               >
                 <span aria-hidden="true" class="fa fa-search"></span>

diff --git a/src/core_plugins/kibana/public/visualize/editor/panels/load.html b/src/core_plugins/kibana/public/visualize/editor/panels/load.html
@@ -1,2 +1,2 @@
-<div class="localDropdownTitle">Open Visualization</div>
+<div class="kuiLocalDropdownTitle">Open Visualization</div>
 <saved-object-finder type="visualizations"></saved-object-finder>
diff --git a/src/core_plugins/kibana/public/visualize/editor/panels/save.html b/src/core_plugins/kibana/public/visualize/editor/panels/save.html
@@ -2,9 +2,9 @@
   role="form"
   ng-submit="opts.doSave()"
 >
-  <div class="localDropdownTitle">Save Visualization</div>
+  <div class="kuiLocalDropdownTitle">Save Visualization</div>
   <input
-    class="localDropdownInput"
+    class="kuiLocalDropdownInput"
     input-focus="select"
     type="text"
     name="visTitle"

diff --git a/src/core_plugins/timelion/public/index.html b/src/core_plugins/timelion/public/index.html
@@ -4,7 +4,7 @@
     <!-- Transcluded elements. -->
     <div data-transclude-slots>
       <div data-transclude-slot="topLeftCorner">
-        <span class="localTitle" ng-show="opts.savedSheet.id">
+        <span class="kuiLocalTitle" ng-show="opts.savedSheet.id">
           {{opts.savedSheet.lastSavedTitle}}
           &nbsp;
           <span class="fa fa-bolt" ng-click="showStats = !showStats"></span>
@@ -23,23 +23,23 @@
         role="form"
         ng-submit="search()"
       >
-        <div class="localSearch timelionLocalSearch">
+        <div class="kuiLocalSearch timelionLocalSearch">
           <input
             input-focus
             ng-model="state.sheet[state.selected]"
             timelion-expression="{{state.sheet[state.selected]}}"
             placeholder="Expression..."
             aria-label="Expression input"
             type="text"
-            class="localSearchInput timelion-expression"
+            class="kuiLocalSearchInput timelion-expression"
           >
 
           <timelion-interval model="state.interval"></timelion-interval>
 
           <button
             type="submit"
             aria-label="Search"
-            class="localSearchButton"
+            class="kuiLocalSearchButton"
           >
             <span class="fa fa-play"></span>
           </button>

diff --git a/src/core_plugins/timelion/public/partials/docs/tutorial.html b/src/core_plugins/timelion/public/partials/docs/tutorial.html
@@ -146,10 +146,10 @@ <h2>Data: Transform <small>insert beat boxing</small></h2>
 </div>
 
 <div ng-show="section === 'functions'">
-  <div class="localDropdownTitle">
+  <div class="kuiLocalDropdownTitle">
     Function reference
   </div>
-  <div class="localDropdownHelpText">
+  <div class="kuiLocalDropdownHelpText">
     Click a function for details and arguments or <a ng-click="section = 'tutorial'">return to the tutorial.</a>
   </div>
   <div class="timelionFunctionsDropdownContent">

diff --git a/src/core_plugins/timelion/public/partials/load_sheet.html b/src/core_plugins/timelion/public/partials/load_sheet.html
@@ -1,4 +1,4 @@
 <form role="form" ng-submit="fetch()">
-  <div class="localDropdownTitle">Open Sheet</div>
+  <div class="kuiLocalDropdownTitle">Open Sheet</div>
   <saved-object-finder type="timelion-sheet" use-local-management="true"></saved-object-finder>
 </form>
diff --git a/src/core_plugins/timelion/public/partials/sheet_options.html b/src/core_plugins/timelion/public/partials/sheet_options.html
@@ -1,5 +1,5 @@
 <form role="form">
-  <div class="localDropdownTitle">Sheet options</div>
+  <div class="kuiLocalDropdownTitle">Sheet options</div>
   <div>
     <div class="form-group col-md-6">
       <label>Columns <small>Column count must divide evenly into 12</small></label>

diff --git a/src/ui/public/chrome/directives/global_nav/global_nav.less b/src/ui/public/chrome/directives/global_nav/global_nav.less
@@ -5,7 +5,7 @@
 @global-nav-logo-height: 70px;
 
 .global-nav {
-  width: @as-closed-width;
+  width: @global-nav-closed-width;
   position: fixed;
   left: 0;
   top: 0;
@@ -15,21 +15,21 @@
   overflow: hidden;
 
   &.is-global-nav-open {
-    width: @as-open-width;
+    width: @global-nav-open-width;
 
     .app-title {
       display: inline-block;
     }
 
     + .app-wrapper {
-      left: @as-open-width;
+      left: @global-nav-open-width;
     }
   }
 
   .logo-small,
   .logo {
     height: @global-nav-logo-height;
-    width: @as-open-width;
+    width: @global-nav-open-width;
     list-style-type: none;
     &.kibana {
       background-image: url("~ui/images/kibana.svg");

diff --git a/src/ui/public/chrome/directives/global_nav/global_nav_link/global_nav_link.less b/src/ui/public/chrome/directives/global_nav/global_nav_link/global_nav_link.less
@@ -2,7 +2,7 @@
 
 .global-nav-link {
   position: relative;
-  width: @as-closed-width;
+  width: @global-nav-closed-width;
   height: @app-icon-height;
   line-height: @app-line-height;
 
@@ -27,7 +27,7 @@
 
 .is-global-nav-open {
   .global-nav-link {
-    width: @as-open-width;
+    width: @global-nav-open-width;
   }
 }
 
@@ -43,7 +43,7 @@
 
   .global-nav-link__icon {
     display: inline-block;
-    width: @as-closed-width;
+    width: @global-nav-closed-width;
     height: @app-icon-height;
     float: left;
     text-align: center;
@@ -70,7 +70,7 @@
 
   .global-nav-link__title {
     display: none;
-    width: calc(@as-open-width - @as-closed-width);
+    width: calc(@global-nav-open-width - @global-nav-closed-width);
     float: right;
     font-size: 0.9em;
     text-align: left;

diff --git a/src/ui/public/chrome/directives/kbn_chrome.less b/src/ui/public/chrome/directives/kbn_chrome.less
@@ -7,7 +7,7 @@ body { overflow-x: hidden; }
 .app-wrapper {
   .real-flex-parent();
   position: absolute;
-  left: @as-closed-width;
+  left: @global-nav-closed-width;
   top: 0;
   right: 0;
   bottom: 0;