github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Remove dark theme when leaving the Dashboard app. Add dark theme for localNav. (#9052)

Browse source 
Backports PR #9032

**Commit 1:**
Remove dark theme when leaving the Dashboard app.

* Original sha: 700f7508de
* Authored by CJ Cenizal <cj@cenizal.com> on 2016-11-10T19:40:34Z

**Commit 2:**
Upgrade kibana-ui-framework to 0.0.10: localNav dark theme styles.

* Original sha: c3396948be
* Authored by CJ Cenizal <cj@cenizal.com> on 2016-11-10T19:48:10Z
This commit is contained in:
jasper 2016-11-11 15:59:53 -05:00 • committed by CJ Cenizal
parent 19723a66c9
commit 574da97c36
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -72,7 +72,7 @@
"@bigfunger/decompress-zip": "0.2.0-stripfix3",
"@bigfunger/jsondiffpatch": "0.1.38-webpack",
"@elastic/datemath": "2.3.0",
"@elastic/kibana-ui-framework": "0.0.9",
"@elastic/kibana-ui-framework": "0.0.10",
"@spalger/filesaver": "1.1.2",
"@spalger/leaflet-draw": "0.2.3",
"@spalger/leaflet-heat": "0.1.3",

12
src/core_plugins/kibana/public/dashboard/index.js
View file

@ -75,8 +75,6 @@ app.directive('dashboardApp', function (Notifier, courier, AppState, timefilter,
}
}
$scope.$on('$destroy', dash.destroy);
const matchQueryFilter = function (filter) {
return filter.query && filter.query.query_string && !filter.meta;
};
@ -103,6 +101,7 @@ app.directive('dashboardApp', function (Notifier, courier, AppState, timefilter,
$scope.$watchCollection('state.options', function (newVal, oldVal) {
if (!angular.equals(newVal, oldVal)) $state.save();
});
$scope.$watch('state.options.darkTheme', setDarkTheme);
$scope.topNavMenu = [{
@ -154,7 +153,14 @@ app.directive('dashboardApp', function (Notifier, courier, AppState, timefilter,
stateMonitor.onChange((status) => {
$appStatus.dirty = status.dirty;
});
$scope.$on('$destroy', () => stateMonitor.destroy());
$scope.$on('$destroy', () => {
stateMonitor.destroy();
dash.destroy();
// Remove dark theme to keep it from affecting the appearance of other apps.
setDarkTheme(false);
});
$scope.$emit('application.load');
}