Skip to content

Commit bcaf446

Browse files
spalgerspalger
committed
Merge branch 'master' of github.com:elastic/kibana into fix/webpack-loader-query-strings
2 parents 4969d66 + 2f93b18 commit bcaf446

114 files changed

Lines changed: 1930 additions & 777 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/core_plugins/console/public/src/directives/help.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="localDropdownTitle">Help</div>
1+
<div class="kuiLocalDropdownTitle">Help</div>
22

33
<tabset>
44
<tab heading="Request format">

‎src/core_plugins/console/public/src/directives/history.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="localDropdownTitle">History</div>
1+
<div class="kuiLocalDropdownTitle">History</div>
22

33
<div class="history-body">
44
<ul class="list-group history-reqs">

‎src/core_plugins/console/public/src/directives/settings.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<div class="localDropdownTitle">Settings</div>
1+
<div class="kuiLocalDropdownTitle">Settings</div>
22

33
<form class="form" name="settingsForm" ng-submit="settingsForm.$valid && settings.apply()">
44
<div class="form-group">
5-
<div class="localDropdownHeader">
6-
<div class="localDropdownHeader__label">Font Size</div>
5+
<div class="kuiLocalDropdownHeader">
6+
<div class="kuiLocalDropdownHeader__label">Font Size</div>
77
</div>
88

99
<div>
@@ -27,8 +27,8 @@
2727
</div>
2828

2929
<div class="form-group">
30-
<div class="localDropdownHeader">
31-
<div class="localDropdownHeader__label">Autocomplete</div>
30+
<div class="kuiLocalDropdownHeader">
31+
<div class="kuiLocalDropdownHeader__label">Autocomplete</div>
3232
</div>
3333

3434
<div class="checkbox">

‎src/core_plugins/console/public/src/directives/welcome.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="localDropdownTitle">Welcome to Console</div>
1+
<div class="kuiLocalDropdownTitle">Welcome to Console</div>
22

33
<p><strong>Quick intro to the UI</strong></p>
44

‎src/core_plugins/kibana/public/dashboard/index.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<!-- Title. -->
77
<div
88
data-transclude-slot="topLeftCorner"
9-
class="localTitle"
9+
class="kuiLocalTitle"
1010
>
1111
<span
1212
ng-show="dash.id"
@@ -24,7 +24,7 @@
2424
ng-submit="filterResults()"
2525
>
2626
<div class="typeahead" kbn-typeahead="dashboard">
27-
<div class="localSearch">
27+
<div class="kuiLocalSearch">
2828
<input
2929
parse-query
3030
input-focus
@@ -33,13 +33,13 @@
3333
placeholder="Filter..."
3434
aria-label="Filter input"
3535
type="text"
36-
class="localSearchInput"
37-
ng-class="{'localSearchInput-isInvalid': queryInput.$invalid}"
36+
class="kuiLocalSearchInput"
37+
ng-class="{'kuiLocalSearchInput-isInvalid': queryInput.$invalid}"
3838
>
3939
<button
4040
type="submit"
4141
aria-label="Filter Dashboards"
42-
class="localSearchButton"
42+
class="kuiLocalSearchButton"
4343
ng-disabled="queryInput.$invalid"
4444
>
4545
<span class="fa fa-search" aria-hidden="true"></span>

‎src/core_plugins/kibana/public/dashboard/partials/load_dashboard.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
<div class="localDropdownTitle">Open Dashboard</div>
1+
<div class="kuiLocalDropdownTitle">Open Dashboard</div>
22
<saved-object-finder type="dashboards"></saved-object-finder>

‎src/core_plugins/kibana/public/dashboard/partials/options.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<form role="form">
2-
<div class="localDropdownTitle">Options</div>
2+
<div class="kuiLocalDropdownTitle">Options</div>
33
<div class="input-group">
44
<label>
55
<input type="checkbox" ng-model="opts.ui.darkTheme" ng-checked="opts.ui.darkTheme">

‎src/core_plugins/kibana/public/dashboard/partials/pick_visualization.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ng-switch="mode"
33
ng-init="mode = 'visualization'"
44
>
5-
<div class="localDropdownTitle">Add Panels</div>
5+
<div class="kuiLocalDropdownTitle">Add Panels</div>
66

77
<ul class="nav nav-tabs">
88
<li ng-class="{active: mode == 'visualization'}">

‎src/core_plugins/kibana/public/dashboard/partials/save_dashboard.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
role="form"
33
ng-submit="opts.save()"
44
>
5-
<div class="localDropdownTitle">Save {{opts.dashboard.getDisplayName()}}</div>
5+
<div class="kuiLocalDropdownTitle">Save {{opts.dashboard.getDisplayName()}}</div>
66
<input
7-
class="localDropdownInput"
7+
class="kuiLocalDropdownInput"
88
id="dashboardTitle"
99
type="text"
1010
ng-model="opts.dashboard.title"

‎src/core_plugins/kibana/public/dev_tools/partials/dev_tools_app.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
></bread-crumbs>
1010

1111
<!-- Tabs. -->
12-
<div data-transclude-slot="bottomRow" class="localTabs">
12+
<div data-transclude-slot="bottomRow" class="kuiLocalTabs">
1313
<a
1414
ng-repeat="item in kbnDevToolsApp.devTools"
15-
class="localTab"
16-
ng-class="{'localTab-isSelected': kbnDevToolsApp.currentPath === item.url}"
15+
class="kuiLocalTab"
16+
ng-class="{'kuiLocalTab-isSelected': kbnDevToolsApp.currentPath === item.url}"
1717
kbn-href="{{::item.url}}"
1818
>
1919
{{::item.display}}

0 commit comments

Comments
 (0)