Skip to content

Commit 011c738

Browse files
abbyhu2000abbyhu2000
authored
Merge branch 'main' into avillk/i18n_fix_gen_scripts
Signed-off-by: Qingyang(Abby) Hu <abigailhu2000@gmail.com>
2 parents f6a8732 + 6bab7ef commit 011c738

File tree

85 files changed

+1398
-806
lines changed

Some content is hidden

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

85 files changed

+1398
-806
lines changed

‎CHANGELOG.md

+61-21
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,62 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
1313
- [CVE-2022-37599] Bump loader-utils from `2.0.3` to `2.0.4` ([#3031](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3031)). Backwards-compatible fixes included in v2.6.0 and v1.3.7 releases.
1414
- [CVE-2022-37603] Bump loader-utils from `2.0.3` to `2.0.4` ([#3031](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3031)). Backwards-compatible fixes included in v2.6.0 and v1.3.7 releases.
1515
- [WS-2021-0638] Bump mocha from `7.2.0` to `10.1.0` ([#2711](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2711))
16+
- [CVE-2023-26115] Bump `word-wrap` from `1.2.3` to `1.2.4` ([#4589](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4589))
17+
18+
### 📈 Features/Enhancements
19+
20+
- Enable theme-switching via Advanced Settings to preview the Next theme ([#4475](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4475))
21+
- Optimize `augment-vis` saved obj searching by adding arg to saved obj client ([#4595](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4595))
22+
- Add resource ID filtering in fetch `augment-vis` obj queries ([#4608](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4608))
23+
24+
### 🐛 Bug Fixes
25+
26+
- [Chore] Update deprecated url methods (url.parse(), url.format()) ([#2910](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2910))
27+
- Cleanup unused url ([#3847](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3847))
28+
- Fix Node.js download link ([#4556](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4556))
29+
- [TSVB, Dashboards] Fix inconsistent dark mode code editor themes ([#4609](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4609))
30+
31+
### 🚞 Infrastructure
32+
33+
- Re-enable CI workflows for feature branches ([#2908](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2908))
34+
- Upgrade yarn version to be compatible with @opensearch-project/opensearch ([#3443](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3443))
35+
- Add an achievement badger to the PR ([#3721](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3721))
36+
37+
### 📝 Documentation
38+
39+
- [Doc] Add COMMUNICATIONS.md with info about Slack, forum, office hours ([#3837](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3837))
40+
- Add plugin development section in DEVELOPER_GUIDE.md ([#3989](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3989))
41+
- [Vis Augmenter] Add documentation to `vis_augmenter` plugin ([#4527](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4527))
42+
43+
### 🛠 Maintenance
44+
45+
- Removes `minimatch` manual resolution ([#3019](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3019))
46+
- Upgrade `vega-lite` dependency from `4.17.0` to `^5.6.0` ([#3076](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3076)). Backwards-compatible version included in v2.5.0 release.
47+
- Bump `js-yaml` from `3.14.0` to `4.1.0` ([#3770](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3770))
48+
49+
### 🪛 Refactoring
50+
51+
- [Console] Remove unused ul element and its custom styling ([#3993](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3993))
52+
- Fix EUI/OUI type errors ([#3798](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3798))
53+
- Remove unused Sass in `tile_map` plugin ([#4110](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4110))
54+
- [Maps Legacy] Removed KUI usage in `maps_legacy` plugin([#3998](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3998))
55+
- [Markdown] Replace custom CSS styles and HTML markup with OUI components ([#4390](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4390))
56+
- [Vis Colors] [VisLib] Update legend colors to use OUI color palette ([#4365](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4365))
57+
- [Vis colors] Update legacy mapped colors in charts plugin to use `ouiPaletteColorBlind()`, Update default color in legacy visualizations to use `ouiPaletteColorBlind()[0]` ([#4398](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4398))
58+
- [Saved Objects Management] Add new or remove extra tags and styles ([#4069](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4069))
59+
- [Console] Migrate `/lib/autocomplete/` module to TypeScript ([#4148](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4148))
60+
- [Console] Migrate `/lib/!autocomplete/` module to TypeScript ([#4150](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4150))
61+
- [Dashboard] Restructure the `Dashboard` plugin folder to be more cohesive with the project ([#4575](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4575))
62+
63+
### 🔩 Tests
64+
65+
## [2.9.0 - 2023-07-24](https://github.com/opensearch-project/OpenSearch-Dashboards/releases/tag/2.9.0)
66+
67+
### 🛡 Security
68+
1669
- Bump `joi` to v14 to avoid the possibility of prototype poisoning in a nested dependency ([#3952](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3952))
1770
- [CVE-2022-25883] Resolve `semver` to `7.5.3` and remove unused package ([#4411](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4411))
18-
- [CVE-2023-26115] Bump `word-wrap` from `1.2.3` to `1.2.4` ([#4589](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4589))
71+
- Bump tough-cookie from 4.0.0 to 4.1.3 ([#4531](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4531))
1972

2073
### 📈 Features/Enhancements
2174

@@ -24,7 +77,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
2477
- Hide any output from use_node checking for Node compatibility ([#4237](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4237))
2578
- Add category option within groups for context menus ([#4144](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4144))
2679
- [Saved Object Service] Add Repository Factory Provider ([#4149](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4149))
27-
- [Sample Data] Add visual consistency dashboard to sample logs data ([#4339](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4339))
80+
- [Sample Data] Add visual consistency dashboard to sample logs data ([#4339](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4339), [#4619](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4619))
2881
- [@osd/pm] Fix `file:`-linked dependencies' resolution to improve ability to test with local packages ([#4342](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4342))
2982
- [Multiple DataSource] Backend support for adding sample data ([#4268](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4268))
3083
- Add configurable defaults and overrides to uiSettings ([#4344](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4344))
@@ -37,8 +90,6 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
3790
- Dashboard De-Angularization ([#4502](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4502))
3891
- New management overview page and rename stack management to dashboard management ([#4287](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4287))
3992
- [Vis Augmenter] Update base vis height in view events flyout ([#4535](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4535))
40-
- Optimize `augment-vis` saved obj searching by adding arg to saved obj client ([#4595](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4595))
41-
4293

4394
### 🐛 Bug Fixes
4495

@@ -48,60 +99,49 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
4899
- [Saved Objects Management] Fix relationships header overflow ([#4070](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4070))
49100
- Update main menu to display 'Dashboards' for consistency ([#4453](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4453))
50101
- [Multiple DataSource] Retain the original sample data API ([#4526](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4526))
51-
- Fix Node.js download link ([#4556](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4556))
102+
- Remove `lmdb-store` to fix backport issue ([#4266](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4266))
52103

53104
### 🚞 Infrastructure
54105

55-
- Re-enable CI workflows for feature branches ([#2908](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2908))
56-
- Upgrade yarn version to be compatible with @opensearch-project/opensearch ([#3443](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3443))
57-
- Add an achievement badger to the PR ([#3721](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3721))
58106
- Upgrade the backport workflow ([#4343](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4343))
59107
- [Lint] Add custom stylelint rules and config to prevent unintended style overrides ([#4290](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4290))
60108
- [Lint] Add stylelint rule to define properties that are restricted from being used ([#4374](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4374))
109+
- [Lint] Add typing to Stylelint rules ([#4392](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4392))
61110
- [CI] Split build and verify into parallel jobs ([#4467](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4467))
62111

63112
### 📝 Documentation
64113

65-
- [Doc] Add COMMUNICATIONS.md with info about Slack, forum, office hours ([#3837](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3837))
66114
- [Saved Object Service] Adds design doc for new Saved Object Service Interface for Custom Repository [#3954](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3954)
67-
- Add plugin development section in DEVELOPER_GUIDE.md ([#778](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3989))
68-
- [Vis Augmenter] Add documentation to `vis_augmenter` plugin ([#4527](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4527))
69115

70116
### 🛠 Maintenance
71117

72-
- Removes `minimatch` manual resolution ([#3019](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3019))
73-
- Upgrade `vega-lite` dependency from `4.17.0` to `^5.6.0` ([#3076](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3076)). Backwards-compatible version included in v2.5.0 release.
74-
- Bump `js-yaml` from `3.14.0` to `4.1.0` ([#3770](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3770))
75118
- Adding @ZilongX and @Flyingliuhub as maintainers. ([#4137](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4137))
76119
- Add new MAINTAINERS to CODEOWNERS file. ([#4199](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4199))
77120
- Adding @BSFishy as maintainer. ([#4469](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4469))
78121

79122
### 🪛 Refactoring
80123

81-
- [Console] Remove unused ul element and its custom styling ([#3993](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3993))
82-
- Fix EUI/OUI type errors ([#3798](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3798))
83-
- Remove unused Sass in `tile_map` plugin ([#4110](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4110))
84124
- [Table Visualization] Remove custom styling for text-align:center in favor of OUI utility class. ([#4164](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4164))
125+
- [Table Visualization] Replace div containers with OuiFlex components ([#4272](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4272))
85126
- Migrate from legacy elasticsearch client to opensearch-js client in `osd-opensearch-archiver` package([#4142](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4142))
86127
- Replace the use of `bluebird` in `saved_objects` plugin ([#4026](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4026))
87-
- [Maps Legacy] Removed KUI usage in `maps_legacy` plugin([#3998](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3998))
88128
- Relocate tutorials imagery into `src/plugins/home/public/assets/tutorials/logos` ([#4382](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4382))
89129
- [VisBuilder] Use OUI icon ([#4446](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4446))
90-
- [Vis Colors] [VisLib] Update legend colors to use OUI color palette ([#4365](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4365))
91130
- [Vis Colors] [Region Maps] Replace hardcode color to OUI color in `region_map` plugin ([#4299](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4299))
92131
- [Vis Colors] Replace color maps with OUI color palettes ([#4293](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4293))
93132
- [Vis Colors] [Maps] Replace hardcoded color to OUI color in `maps_legacy` plugin ([#4294](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4294))
94133
- [Vis Colors] [TSVB] Update default color in `vis_type_timeseries` to use `ouiPaletteColorBlind()[0]`([#4363](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4363))
95134
- [Vis Colors] [Timeline] Replace `vis_type_timeline` colors with `ouiPaletteColorBlind()` ([#4366](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4366))
96135
- [Vis Colors] Update legacy seed colors to use `ouiPaletteColorBlind()` ([#4348](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4348))
97-
- [Vis colors] Update legacy mapped colors in charts plugin to use `ouiPaletteColorBlind()`, Update default color in legacy visualizations to use `ouiPaletteColorBlind()[0]` ([#4398](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4398))
98-
- [Saved Objects Management] Add new or remove extra tags and styles ([#4069](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4069))
99136
- [Console] Migrate `/lib/mappings/` module to TypeScript ([#4008](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4008))
137+
- [Console] Migrate `/lib/autocomplete/` module to TypeScript ([#4148](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4148))
100138
- [Dashboard] Restructure the `Dashboard` plugin folder to be more cohesive with the project ([#4575](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4575))
139+
- [Chrome] Remove breadcrumb style overrrides ([#4621](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4621))
101140

102141
### 🔩 Tests
103142

104143
- [Vis Augmenter Add UT for few fns ([#4516](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4516))
144+
- [BWC Tests] Add BWC tests for 2.7.0 and 2.8.0 ([#4023](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4023))
105145

106146
## [2.8.0 - 2023-06-06](https://github.com/opensearch-project/OpenSearch-Dashboards/releases/tag/2.8.0)
107147

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
"dependencies": {
123123
"@aws-crypto/client-node": "^3.1.1",
124124
"@elastic/datemath": "5.0.3",
125-
"@elastic/eui": "npm:@opensearch-project/oui@1.1.2",
125+
"@elastic/eui": "npm:@opensearch-project/oui@1.3.0-alpha.2",
126126
"@elastic/good": "^9.0.1-kibana3",
127127
"@elastic/numeral": "^2.5.0",
128128
"@elastic/request-crypto": "2.0.0",

‎packages/osd-optimizer/src/common/theme_tags.test.ts

+2
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ it('returns default tags when passed undefined', () => {
3535
Array [
3636
"v7dark",
3737
"v7light",
38+
"v8dark",
39+
"v8light",
3840
]
3941
`);
4042
});

‎packages/osd-optimizer/src/common/theme_tags.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ const isArrayOfStrings = (input: unknown): input is string[] =>
3939

4040
export type ThemeTags = readonly ThemeTag[];
4141
export type ThemeTag = 'v7light' | 'v7dark' | 'v8light' | 'v8dark';
42-
export const DEFAULT_THEMES = tags('v7light', 'v7dark');
42+
export const DEFAULT_THEMES = tags('v7light', 'v7dark', 'v8light', 'v8dark');
4343
export const ALL_THEMES = tags('v7light', 'v7dark', 'v8light', 'v8dark');
4444

4545
export function parseThemeTags(input?: any): ThemeTags {

‎packages/osd-optimizer/src/integration_tests/__snapshots__/basic_optimization.test.ts.snap

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/osd-optimizer/src/integration_tests/basic_optimization.test.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ it('builds expected bundles, saves bundle counts to metadata', async () => {
176176
bar.cache.refresh();
177177
expect(bar.cache.getModuleCount()).toBe(
178178
// code + styles + style/css-loader runtimes + public path updater
179-
17
179+
25
180180
);
181181

182182
expect(bar.cache.getReferencedFiles()?.map(absolutePathSerializer.serialize).sort())
@@ -193,6 +193,8 @@ it('builds expected bundles, saves bundle counts to metadata', async () => {
193193
"<absolute path>/packages/osd-optimizer/src/__fixtures__/__tmp__/mock_repo/plugins/bar/public/lib.ts",
194194
"<absolute path>/packages/osd-optimizer/src/__fixtures__/__tmp__/mock_repo/src/core/public/core_app/styles/_globals_v7dark.scss",
195195
"<absolute path>/packages/osd-optimizer/src/__fixtures__/__tmp__/mock_repo/src/core/public/core_app/styles/_globals_v7light.scss",
196+
"<absolute path>/packages/osd-optimizer/src/__fixtures__/__tmp__/mock_repo/src/core/public/core_app/styles/_globals_v8dark.scss",
197+
"<absolute path>/packages/osd-optimizer/src/__fixtures__/__tmp__/mock_repo/src/core/public/core_app/styles/_globals_v8light.scss",
196198
"<absolute path>/packages/osd-optimizer/target/worker/entry_point_creator.js",
197199
"<absolute path>/packages/osd-ui-shared-deps/public_path_module_creator.js",
198200
]

‎packages/osd-optimizer/src/optimizer/cache_keys.test.ts

+2
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ describe('getOptimizerCacheKey()', () => {
101101
"themeTags": Array [
102102
"v7dark",
103103
"v7light",
104+
"v8dark",
105+
"v8light",
104106
],
105107
},
106108
}

‎packages/osd-ui-framework/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"enzyme-adapter-react-16": "^1.9.1"
2424
},
2525
"devDependencies": {
26-
"@elastic/eui": "npm:@opensearch-project/oui@1.1.2",
26+
"@elastic/eui": "npm:@opensearch-project/oui@1.3.0-alpha.2",
2727
"@osd/babel-preset": "1.0.0",
2828
"@osd/optimizer": "1.0.0",
2929
"grunt": "^1.5.2",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"dependencies": {
1212
"@elastic/charts": "31.1.0",
13-
"@elastic/eui": "npm:@opensearch-project/oui@1.1.2",
13+
"@elastic/eui": "npm:@opensearch-project/oui@1.3.0-alpha.2",
1414
"@elastic/numeral": "^2.5.0",
1515
"@osd/i18n": "1.0.0",
1616
"@osd/monaco": "1.0.0",

‎packages/osd-ui-shared-deps/theme.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ if (version === 7) {
4646
euiLightVars = require('@elastic/eui/dist/eui_theme_light.json');
4747
euiDarkVars = require('@elastic/eui/dist/eui_theme_dark.json');
4848
} else {
49-
euiLightVars = require('@elastic/eui/dist/eui_theme_amsterdam_light.json');
50-
euiDarkVars = require('@elastic/eui/dist/eui_theme_amsterdam_dark.json');
49+
euiLightVars = require('@elastic/eui/dist/eui_theme_next_light.json');
50+
euiDarkVars = require('@elastic/eui/dist/eui_theme_next_dark.json');
5151
}
5252

5353
/**

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ exports.getWebpackConfig = ({ dev = false } = {}) => ({
4545
'osd-ui-shared-deps': './entry.js',
4646
'osd-ui-shared-deps.v7.dark': ['@elastic/eui/dist/eui_theme_dark.css'],
4747
'osd-ui-shared-deps.v7.light': ['@elastic/eui/dist/eui_theme_light.css'],
48-
'osd-ui-shared-deps.v8.dark': ['@elastic/eui/dist/eui_theme_amsterdam_dark.css'],
49-
'osd-ui-shared-deps.v8.light': ['@elastic/eui/dist/eui_theme_amsterdam_light.css'],
48+
'osd-ui-shared-deps.v8.dark': ['@elastic/eui/dist/eui_theme_next_dark.css'],
49+
'osd-ui-shared-deps.v8.light': ['@elastic/eui/dist/eui_theme_next_light.css'],
5050
},
5151
context: __dirname,
5252
devtool: dev ? '#cheap-source-map' : false,

‎src/core/public/_variables.scss

-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
11
@import "@elastic/eui/src/global_styling/variables/header";
22

33
$osdHeaderOffset: $euiHeaderHeightCompensation;
4-
$osdHeaderBreadcrumbBlueBackground: #b9d9eb;
5-
$osdHeaderBreadcrumbGrayBackground: #d9e1e2;
6-
$osdHeaderBreadcrumbCollapsedLink: #002a3a;
7-
$osdHeaderBreadcrumbPacificSkyDarkestBackground: #163f66;
8-
$osdHeaderBreadcrumbMidnightSkyMediumBackground: #4c636f;
9-
$osdHeaderBreadcrumbMidnightSkyMediumLightColor: #96a0a5;
10-
$osdHeaderBreadcrumbMidnightSkyMediumLightHoverColor: #b0b8bb;

0 commit comments

Comments
 (0)