Skip to content

[6.5] [Bug] Fixing flash of unstyled dashboard content (#25559) #25628

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 20, 2018
Merged

[6.5] [Bug] Fixing flash of unstyled dashboard content (#25559) #25628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/core_plugins/kibana/public/dashboard/_hacks.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ dashboard-listing {
// Yes, this is a hack because bootstrap will be removed and everything must move to EUI theming
// Can't reliably remove all/any of these because of embeddables

.tab-dashboard.theme-dark {
@import './../../../../../node_modules/@elastic/eui/src/themes/k6/k6_colors_dark';
.theme-dark {
@import '@elastic/eui/src/themes/k6/k6_colors_dark';

// /src/ui/public/styles/bootstrap/scaffolding.less
a {
Expand Down
10 changes: 6 additions & 4 deletions src/core_plugins/kibana/public/dashboard/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@
/**
* 1. Don't duplicate styles in dark mode
*/
.tab-dashboard.theme-light { /* 1 */
.theme-light { /* 1 */
@import 'dashboard_app';
@import 'grid/index';
@import 'panel/index';
@import 'viewport/index';
}

// Imports outside of .tab-dashboard selector don't change between light/dark modes
// Imports outside of theme selector don't change between light/dark modes
@import 'components/index';

// Must be outside of theme selector because it lives in a portal
Expand All @@ -33,14 +33,16 @@
// EUI global scope -- dark
@import '@elastic/eui/src/themes/k6/k6_colors_dark';

.tab-dashboard.theme-dark {
.theme-dark {
background-color: $euiColorEmptyShade;

@import 'dashboard_app';
@import 'grid/index';
@import 'panel/index';
@import 'viewport/index';

// Vis imports
// Vis imports -- will have some duplicate styling
// because they will be imported via ui/public as well
// (without .theme-[] prefix)
@import 'src/ui/public/vis/map/index';
}