Skip to content

Commit dbd0641

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into prevent-public-import
2 parents fafa902 + 875d698 commit dbd0641

44 files changed

Lines changed: 1932 additions & 307 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.

‎packages/kbn-ui-shared-deps/entry.js‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,16 @@ export const ElasticCharts = require('@elastic/charts');
4848
export const ElasticEui = require('@elastic/eui');
4949
export const ElasticEuiLibServices = require('@elastic/eui/lib/services');
5050
export const ElasticEuiLibServicesFormat = require('@elastic/eui/lib/services/format');
51-
export const ElasticEuiLightTheme = require('@elastic/eui/dist/eui_theme_light.json');
52-
export const ElasticEuiDarkTheme = require('@elastic/eui/dist/eui_theme_dark.json');
5351
export const ElasticEuiChartsTheme = require('@elastic/eui/dist/eui_charts_theme');
52+
export let ElasticEuiLightTheme;
53+
export let ElasticEuiDarkTheme;
54+
if (window.__kbnThemeVersion__ === 'v7') {
55+
ElasticEuiLightTheme = require('@elastic/eui/dist/eui_theme_light.json');
56+
ElasticEuiDarkTheme = require('@elastic/eui/dist/eui_theme_dark.json');
57+
} else {
58+
ElasticEuiLightTheme = require('@elastic/eui/dist/eui_theme_amsterdam_light.json');
59+
ElasticEuiDarkTheme = require('@elastic/eui/dist/eui_theme_amsterdam_dark.json');
60+
}
5461

5562
// massive deps that we should really get rid of or reduce in size substantially
5663
export const ElasticsearchBrowser = require('elasticsearch-browser/elasticsearch.js');

‎packages/kbn-ui-shared-deps/index.d.ts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,21 @@ export const baseCssDistFilename: string;
4242
*/
4343
export const darkCssDistFilename: string;
4444

45+
/**
46+
* Filename of the dark-theme css file in the distributable directory
47+
*/
48+
export const darkV8CssDistFilename: string;
49+
4550
/**
4651
* Filename of the light-theme css file in the distributable directory
4752
*/
4853
export const lightCssDistFilename: string;
4954

55+
/**
56+
* Filename of the light-theme css file in the distributable directory
57+
*/
58+
export const lightV8CssDistFilename: string;
59+
5060
/**
5161
* Externals mapping inteded to be used in a webpack config
5262
*/

‎packages/kbn-ui-shared-deps/index.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,10 @@ exports.distDir = Path.resolve(__dirname, 'target');
2323
exports.jsDepFilenames = ['kbn-ui-shared-deps.@elastic.js'];
2424
exports.jsFilename = 'kbn-ui-shared-deps.js';
2525
exports.baseCssDistFilename = 'kbn-ui-shared-deps.css';
26-
exports.lightCssDistFilename = 'kbn-ui-shared-deps.light.css';
27-
exports.darkCssDistFilename = 'kbn-ui-shared-deps.dark.css';
26+
exports.lightCssDistFilename = 'kbn-ui-shared-deps.v7.light.css';
27+
exports.lightV8CssDistFilename = 'kbn-ui-shared-deps.v8.light.css';
28+
exports.darkCssDistFilename = 'kbn-ui-shared-deps.v7.dark.css';
29+
exports.darkV8CssDistFilename = 'kbn-ui-shared-deps.v8.dark.css';
2830
exports.externals = {
2931
// stateful deps
3032
angular: '__kbnSharedDeps__.Angular',

‎packages/kbn-ui-shared-deps/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"scripts": {
77
"build": "node scripts/build",
88
"kbn:bootstrap": "node scripts/build --dev",
9-
"kbn:watch": "node scripts/build --watch"
9+
"kbn:watch": "node scripts/build --dev --watch"
1010
},
1111
"dependencies": {
1212
"@elastic/charts": "19.2.0",

‎packages/kbn-ui-shared-deps/webpack.config.js‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,22 @@ exports.getWebpackConfig = ({ dev = false } = {}) => ({
3232
mode: dev ? 'development' : 'production',
3333
entry: {
3434
'kbn-ui-shared-deps': './entry.js',
35-
'kbn-ui-shared-deps.dark': [
35+
'kbn-ui-shared-deps.v7.dark': [
3636
'@elastic/eui/dist/eui_theme_dark.css',
3737
'@elastic/charts/dist/theme_only_dark.css',
3838
],
39-
'kbn-ui-shared-deps.light': [
39+
'kbn-ui-shared-deps.v7.light': [
4040
'@elastic/eui/dist/eui_theme_light.css',
4141
'@elastic/charts/dist/theme_only_light.css',
4242
],
43+
'kbn-ui-shared-deps.v8.dark': [
44+
'@elastic/eui/dist/eui_theme_amsterdam_dark.css',
45+
'@elastic/charts/dist/theme_only_dark.css',
46+
],
47+
'kbn-ui-shared-deps.v8.light': [
48+
'@elastic/eui/dist/eui_theme_amsterdam_light.css',
49+
'@elastic/charts/dist/theme_only_light.css',
50+
],
4351
},
4452
context: __dirname,
4553
devtool: dev ? '#cheap-source-map' : false,

‎src/cli/serve/serve.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@ export default function(program) {
254254
basePath: opts.runExamples ? false : !!opts.basePath,
255255
optimize: !!opts.optimize,
256256
oss: !!opts.oss,
257+
cache: !!opts.cache,
257258
},
258259
features: {
259260
isClusterModeSupported: CAN_CLUSTER,

‎src/legacy/core_plugins/kibana/server/ui_setting_defaults.js‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -810,6 +810,18 @@ export function getUiSettingDefaults() {
810810
}),
811811
requiresPageReload: true,
812812
},
813+
'theme:version': {
814+
name: i18n.translate('kbn.advancedSettings.themeVersionTitle', {
815+
defaultMessage: 'Theme version',
816+
}),
817+
value: 'v7',
818+
type: 'select',
819+
options: ['v7', 'v8 (beta)'],
820+
description: i18n.translate('kbn.advancedSettings.themeVersionText', {
821+
defaultMessage: `Switch between the theme used for the current and next version of Kibana. A page refresh is required for the setting to be applied.`,
822+
}),
823+
requiresPageReload: true,
824+
},
813825
'filters:pinnedByDefault': {
814826
name: i18n.translate('kbn.advancedSettings.pinFiltersTitle', {
815827
defaultMessage: 'Pin filters by default',

‎src/legacy/ui/ui_render/bootstrap/template.js.hbs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
var kbnCsp = JSON.parse(document.querySelector('kbn-csp').getAttribute('data'));
22
window.__kbnStrictCsp__ = kbnCsp.strictCsp;
33
window.__kbnDarkMode__ = {{darkMode}};
4+
window.__kbnThemeVersion__ = "{{themeVersion}}";
45
window.__kbnPublicPath__ = {{publicPathMap}};
56

67
if (window.__kbnStrictCsp__ && window.__kbnCspNotEnforced__) {

‎src/legacy/ui/ui_render/ui_render_mixin.js‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,11 @@ export function uiRenderMixin(kbnServer, server, config) {
9696
? await uiSettings.get('theme:darkMode')
9797
: false;
9898

99+
const themeVersion =
100+
!authEnabled || request.auth.isAuthenticated
101+
? await uiSettings.get('theme:version')
102+
: 'v7';
103+
99104
const buildHash = server.newPlatform.env.packageInfo.buildNum;
100105
const basePath = config.get('server.basePath');
101106

@@ -114,12 +119,16 @@ export function uiRenderMixin(kbnServer, server, config) {
114119
`${regularBundlePath}/kbn-ui-shared-deps/${UiSharedDeps.baseCssDistFilename}`,
115120
...(darkMode
116121
? [
117-
`${regularBundlePath}/kbn-ui-shared-deps/${UiSharedDeps.darkCssDistFilename}`,
122+
themeVersion === 'v7'
123+
? `${regularBundlePath}/kbn-ui-shared-deps/${UiSharedDeps.darkCssDistFilename}`
124+
: `${regularBundlePath}/kbn-ui-shared-deps/${UiSharedDeps.darkV8CssDistFilename}`,
118125
`${basePath}/node_modules/@kbn/ui-framework/dist/kui_dark.css`,
119126
`${regularBundlePath}/dark_theme.style.css`,
120127
]
121128
: [
122-
`${regularBundlePath}/kbn-ui-shared-deps/${UiSharedDeps.lightCssDistFilename}`,
129+
themeVersion === 'v7'
130+
? `${regularBundlePath}/kbn-ui-shared-deps/${UiSharedDeps.lightCssDistFilename}`
131+
: `${regularBundlePath}/kbn-ui-shared-deps/${UiSharedDeps.lightV8CssDistFilename}`,
123132
`${basePath}/node_modules/@kbn/ui-framework/dist/kui_light.css`,
124133
`${regularBundlePath}/light_theme.style.css`,
125134
]),
@@ -186,6 +195,7 @@ export function uiRenderMixin(kbnServer, server, config) {
186195
const bootstrap = new AppBootstrap({
187196
templateData: {
188197
darkMode,
198+
themeVersion,
189199
jsDependencyPaths,
190200
styleSheetPaths,
191201
publicPathMap,

‎x-pack/plugins/canvas/public/components/page_manager/page_manager.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,10 @@ export class PageManager extends React.PureComponent {
219219
content="Add a new page to this workpad"
220220
position="left"
221221
>
222-
<button onClick={addPage} className="canvasPageManager__addPage">
222+
<button
223+
onClick={addPage}
224+
className="canvasPageManager__addPage kbn-resetFocusState"
225+
>
223226
<EuiIcon color="ghost" type="plusInCircle" size="l" />
224227
</button>
225228
</EuiToolTip>

0 commit comments

Comments
 (0)