From e1f6e9aceb5113680ca6af68d0862bc76ebf29ef Mon Sep 17 00:00:00 2001 From: chorn Date: Mon, 4 Feb 2019 14:43:59 -0500 Subject: [PATCH 1/8] First foray into turning .application background off --- src/legacy/core_plugins/console/public/_app.scss | 2 +- .../kibana/public/dashboard/_dashboard_app.scss | 5 ----- src/legacy/core_plugins/kibana/public/dashboard/_hacks.scss | 2 +- .../public/dashboard/viewport/_dashboard_viewport.scss | 1 - .../core_plugins/kibana/public/discover/_discover.scss | 5 +++++ src/legacy/core_plugins/kibana/public/home/_home.scss | 2 +- .../core_plugins/kibana/public/management/_hacks.scss | 4 ++-- .../kibana/public/visualize/wizard/_wizard.scss | 2 +- .../metrics/public/components/_series_editor.scss | 1 - .../core_plugins/metrics/public/components/_vis_editor.scss | 2 +- .../public/components/panel_config/_panel_config.scss | 1 - src/ui/public/doc_viewer/_doc_viewer.scss | 3 ++- src/ui/public/kbn_top_nav/_kbn_top_nav.scss | 2 +- src/ui/public/styles/_legacy/_base.scss | 1 - src/ui/public/styles/_legacy/components/_config.scss | 2 +- src/ui/public/styles/_mixins.scss | 2 +- .../canvas/public/apps/workpad/workpad_app/workpad_app.scss | 6 +++--- .../plugins/canvas/public/components/toolbar/tray/tray.scss | 2 +- x-pack/plugins/canvas/public/style/main.scss | 2 +- x-pack/plugins/graph/public/templates/_graph.scss | 1 + .../plugins/index_management/public/_index_management.scss | 4 ++-- x-pack/plugins/maps/public/components/gis_map/_gis_map.scss | 3 ++- .../plugins/maps/public/shared/components/_map_listing.scss | 2 +- .../ml/public/datavisualizer/selector/_selector.scss | 2 +- .../ml/public/file_datavisualizer/_file_datavisualizer.scss | 2 +- x-pack/plugins/ml/public/settings/_settings.scss | 2 +- x-pack/plugins/ml/public/settings/calendars/_calendars.scss | 2 +- .../ml/public/settings/filter_lists/_filter_lists.scss | 2 +- x-pack/plugins/monitoring/public/_hacks.scss | 6 ------ .../spaces/public/views/management/_manage_spaces.scss | 2 +- x-pack/plugins/upgrade_assistant/public/_app.scss | 2 +- .../threshold_watch_edit/_threshold_watch_edit.scss | 2 +- 32 files changed, 36 insertions(+), 43 deletions(-) diff --git a/src/legacy/core_plugins/console/public/_app.scss b/src/legacy/core_plugins/console/public/_app.scss index 16e3bb33caa59..54c84295c54b0 100644 --- a/src/legacy/core_plugins/console/public/_app.scss +++ b/src/legacy/core_plugins/console/public/_app.scss @@ -3,7 +3,7 @@ flex: 1 1 auto; position: relative; padding: $euiSizeS; - background-color: $euiColorLightestShade; + background-color: $euiPageBackgroundColor; // Make sure the editor actions don't create scrollbars on this container // SASSTODO: Uncomment when tooltips are EUI-ified (inside portals) // overflow: hidden; diff --git a/src/legacy/core_plugins/kibana/public/dashboard/_dashboard_app.scss b/src/legacy/core_plugins/kibana/public/dashboard/_dashboard_app.scss index 2d1347f0e2964..2df6d07bb391c 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/_dashboard_app.scss +++ b/src/legacy/core_plugins/kibana/public/dashboard/_dashboard_app.scss @@ -2,11 +2,6 @@ flex: 1; display: flex; flex-direction: column; - background-color: $euiColorEmptyShade; -} - -.dshAppContainer--withMargins { - background-color: $euiColorLightestShade; } .dshStartScreen { diff --git a/src/legacy/core_plugins/kibana/public/dashboard/_hacks.scss b/src/legacy/core_plugins/kibana/public/dashboard/_hacks.scss index 13d23c1d1948d..bfa166b838d8e 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/_hacks.scss +++ b/src/legacy/core_plugins/kibana/public/dashboard/_hacks.scss @@ -4,7 +4,7 @@ * Mimics EuiPageBackground */ dashboard-listing { - background-color: $euiColorLightestShade; + background-color: $euiPageBackgroundColor; min-height: 100vh; } diff --git a/src/legacy/core_plugins/kibana/public/dashboard/viewport/_dashboard_viewport.scss b/src/legacy/core_plugins/kibana/public/dashboard/viewport/_dashboard_viewport.scss index 25f5476bfe92c..7cbe135115877 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/viewport/_dashboard_viewport.scss +++ b/src/legacy/core_plugins/kibana/public/dashboard/viewport/_dashboard_viewport.scss @@ -5,5 +5,4 @@ .dshDashboardViewport-withMargins { width: 100%; - background-color: $euiPageBackgroundColor; } diff --git a/src/legacy/core_plugins/kibana/public/discover/_discover.scss b/src/legacy/core_plugins/kibana/public/discover/_discover.scss index 1b41628fabdd4..9098e7fba4bdb 100644 --- a/src/legacy/core_plugins/kibana/public/discover/_discover.scss +++ b/src/legacy/core_plugins/kibana/public/discover/_discover.scss @@ -1,3 +1,7 @@ +discover-app { + background-color: $euiColorEmptyShade; +} + // SASSTODO: replace the margin-top value with a variable .dscSidebar__listHeader { margin-top: 5px; @@ -175,6 +179,7 @@ } .dscResults { + h3 { margin: -20px 0 10px 0; text-align: center; diff --git a/src/legacy/core_plugins/kibana/public/home/_home.scss b/src/legacy/core_plugins/kibana/public/home/_home.scss index 48c41254ff041..59f5446d826ef 100644 --- a/src/legacy/core_plugins/kibana/public/home/_home.scss +++ b/src/legacy/core_plugins/kibana/public/home/_home.scss @@ -1,5 +1,5 @@ home-app { - background-color: $euiColorLightestShade; + background-color: $euiPageBackgroundColor; } .homPage { diff --git a/src/legacy/core_plugins/kibana/public/management/_hacks.scss b/src/legacy/core_plugins/kibana/public/management/_hacks.scss index dcd92e1971b5a..05861fa0044d0 100644 --- a/src/legacy/core_plugins/kibana/public/management/_hacks.scss +++ b/src/legacy/core_plugins/kibana/public/management/_hacks.scss @@ -12,7 +12,7 @@ kbn-management-objects-view { // SASSTODO: Remove when Kibana has a proper background color kbn-management-objects, kbn-management-app, .tab-management { - background: $euiColorLightestShade; + background: $euiPageBackgroundColor; flex-grow: 1; } @@ -47,4 +47,4 @@ kbn-management-objects-view { // Hack because the management wrapper is flat HTML and needs a class .mgtPage__body { max-width: map-get($euiBreakpoints, 'xl'); -} \ No newline at end of file +} diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/_wizard.scss b/src/legacy/core_plugins/kibana/public/visualize/wizard/_wizard.scss index 0e811b500a869..3f11c36511550 100644 --- a/src/legacy/core_plugins/kibana/public/visualize/wizard/_wizard.scss +++ b/src/legacy/core_plugins/kibana/public/visualize/wizard/_wizard.scss @@ -11,7 +11,7 @@ .visWizard__row { flex: 1; - background-color: $euiColorLightestShade; + background-color: $euiColorEmptyShade; } .visWizard__column--small { diff --git a/src/legacy/core_plugins/metrics/public/components/_series_editor.scss b/src/legacy/core_plugins/metrics/public/components/_series_editor.scss index 38d879414d326..281abefbf8ce7 100644 --- a/src/legacy/core_plugins/metrics/public/components/_series_editor.scss +++ b/src/legacy/core_plugins/metrics/public/components/_series_editor.scss @@ -2,7 +2,6 @@ .tvbSeriesEditor__container { padding: $euiSize; - background-color: $euiColorLightestShade; } @include euiPanel('tvbSeriesEditor'); diff --git a/src/legacy/core_plugins/metrics/public/components/_vis_editor.scss b/src/legacy/core_plugins/metrics/public/components/_vis_editor.scss index d171e6874b2a6..7a0d3097426a9 100644 --- a/src/legacy/core_plugins/metrics/public/components/_vis_editor.scss +++ b/src/legacy/core_plugins/metrics/public/components/_vis_editor.scss @@ -1,4 +1,4 @@ .tvbEditor { flex: 1; - background: $euiColorLightestShade; + background: $euiPageBackgroundColor; } diff --git a/src/legacy/core_plugins/metrics/public/components/panel_config/_panel_config.scss b/src/legacy/core_plugins/metrics/public/components/panel_config/_panel_config.scss index 886b64f6fe647..948b23f1da4e5 100644 --- a/src/legacy/core_plugins/metrics/public/components/panel_config/_panel_config.scss +++ b/src/legacy/core_plugins/metrics/public/components/panel_config/_panel_config.scss @@ -1,4 +1,3 @@ .tvbPanelConfig__container { padding: $euiSize; - background-color: $euiColorLightestShade; } diff --git a/src/ui/public/doc_viewer/_doc_viewer.scss b/src/ui/public/doc_viewer/_doc_viewer.scss index abc956300e2b5..9dde3460f5b18 100644 --- a/src/ui/public/doc_viewer/_doc_viewer.scss +++ b/src/ui/public/doc_viewer/_doc_viewer.scss @@ -18,7 +18,8 @@ } .kbnDocViewer__content { - margin: $euiSizeS 0 0 0; + background-color: $euiColorEmptyShade; + padding: $euiSizeS 0 0 0; } .kbnDocViewer__buttons, diff --git a/src/ui/public/kbn_top_nav/_kbn_top_nav.scss b/src/ui/public/kbn_top_nav/_kbn_top_nav.scss index 284080ac371e8..f1a4e7b71f6a8 100644 --- a/src/ui/public/kbn_top_nav/_kbn_top_nav.scss +++ b/src/ui/public/kbn_top_nav/_kbn_top_nav.scss @@ -3,7 +3,7 @@ */ .kbnTopNav { - background-color: $euiColorLightestShade; + background-color: $euiPageBackgroundColor; border-bottom: $euiBorderThin; } diff --git a/src/ui/public/styles/_legacy/_base.scss b/src/ui/public/styles/_legacy/_base.scss index f76903e209ff3..4fd3cc8b4a685 100644 --- a/src/ui/public/styles/_legacy/_base.scss +++ b/src/ui/public/styles/_legacy/_base.scss @@ -70,7 +70,6 @@ input[type="checkbox"], } .application { - background-color: $euiColorEmptyShade; position: relative; z-index: 0; display: flex; diff --git a/src/ui/public/styles/_legacy/components/_config.scss b/src/ui/public/styles/_legacy/components/_config.scss index 8412f2d8dc7b6..b56826f1e7088 100644 --- a/src/ui/public/styles/_legacy/components/_config.scss +++ b/src/ui/public/styles/_legacy/components/_config.scss @@ -5,7 +5,7 @@ border-bottom: 1px solid transparent; .container-fluid { - background-color: $euiColorLightestShade; + background-color: $euiPageBackgroundColor; padding: $euiSizeS; } } diff --git a/src/ui/public/styles/_mixins.scss b/src/ui/public/styles/_mixins.scss index 1a11a509c2462..6a6a44006bfee 100644 --- a/src/ui/public/styles/_mixins.scss +++ b/src/ui/public/styles/_mixins.scss @@ -26,7 +26,7 @@ @mixin kibana-resizer($size: ($euiSizeM + 2px), $direction: horizontal) { display: flex; flex: 0 0 $size; - background-color: $euiColorLightestShade; + background-color: $euiPageBackgroundColor; align-items: center; justify-content: center; margin: 0; diff --git a/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_app.scss b/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_app.scss index 9b289151ee6dd..a7b01436ffed9 100644 --- a/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_app.scss +++ b/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_app.scss @@ -1,6 +1,6 @@ .canvasLayout { display: flex; - background: $euiColorLightestShade; + background: $euiPageBackgroundColor; flex-grow: 1; overflow: hidden; } @@ -54,7 +54,7 @@ flex-grow: 0; flex-basis: auto; width: 350px; - background: darken($euiColorLightestShade, 2%); + background: $euiColorLightestShade; display: flex; position: relative; @@ -67,6 +67,6 @@ flex-grow: 0; flex-basis: auto; width: 100%; - background-color: $euiColorLightestShade; + background-color: $euiPageBackgroundColor; z-index: $euiZNavigation; } diff --git a/x-pack/plugins/canvas/public/components/toolbar/tray/tray.scss b/x-pack/plugins/canvas/public/components/toolbar/tray/tray.scss index beba97760253e..50a319c9495c3 100644 --- a/x-pack/plugins/canvas/public/components/toolbar/tray/tray.scss +++ b/x-pack/plugins/canvas/public/components/toolbar/tray/tray.scss @@ -5,6 +5,6 @@ } .canvasTray__panel { - background-color: $euiColorLightestShade; + background-color: $euiPageBackgroundColor; border-radius: 0; } diff --git a/x-pack/plugins/canvas/public/style/main.scss b/x-pack/plugins/canvas/public/style/main.scss index 7893ed7c909b4..0130a2fbe77c0 100644 --- a/x-pack/plugins/canvas/public/style/main.scss +++ b/x-pack/plugins/canvas/public/style/main.scss @@ -1,7 +1,7 @@ .canvas.canvasContainer { display: flex; flex-grow: 1; - background-color: $euiColorLightestShade; + background-color: $euiPageBackgroundColor; } .canvasContainer--loading { diff --git a/x-pack/plugins/graph/public/templates/_graph.scss b/x-pack/plugins/graph/public/templates/_graph.scss index 207d79c70d24f..556988ee99d82 100644 --- a/x-pack/plugins/graph/public/templates/_graph.scss +++ b/x-pack/plugins/graph/public/templates/_graph.scss @@ -14,6 +14,7 @@ */ .gphGraph__container { + background: $euiColorEmptyShade; position: fixed; height: 100%; width: calc(100% - #{$kbnGlobalNavClosedWidth}); /* 1 */ diff --git a/x-pack/plugins/index_management/public/_index_management.scss b/x-pack/plugins/index_management/public/_index_management.scss index 782657a5537c3..af299cb904066 100644 --- a/x-pack/plugins/index_management/public/_index_management.scss +++ b/x-pack/plugins/index_management/public/_index_management.scss @@ -1,5 +1,5 @@ #indReactRoot, #indexManagementReactRoot { - background-color: $euiColorLightestShade; + background-color: $euiPageBackgroundColor; } .indTable { @@ -25,4 +25,4 @@ .indDetail__codeBlock { background: transparent; -} \ No newline at end of file +} diff --git a/x-pack/plugins/maps/public/components/gis_map/_gis_map.scss b/x-pack/plugins/maps/public/components/gis_map/_gis_map.scss index ecce615d036b0..85168d970c6de 100644 --- a/x-pack/plugins/maps/public/components/gis_map/_gis_map.scss +++ b/x-pack/plugins/maps/public/components/gis_map/_gis_map.scss @@ -1,9 +1,10 @@ .mapMapWrapper { + background-color: $euiColorEmptyShade; position: relative; } .mapMapLayerPanel { - background-color: $euiColorLightestShade; + background-color: $euiPageBackgroundColor; width: 0; overflow: hidden; diff --git a/x-pack/plugins/maps/public/shared/components/_map_listing.scss b/x-pack/plugins/maps/public/shared/components/_map_listing.scss index cc2d8f7c726e2..8efaad3b57ded 100644 --- a/x-pack/plugins/maps/public/shared/components/_map_listing.scss +++ b/x-pack/plugins/maps/public/shared/components/_map_listing.scss @@ -1,5 +1,5 @@ // Makes sure the listing page is full height with proper background map-listing, { min-height: 100vh; - background-color: $euiColorLightestShade; + background-color: $euiPageBackgroundColor; } diff --git a/x-pack/plugins/ml/public/datavisualizer/selector/_selector.scss b/x-pack/plugins/ml/public/datavisualizer/selector/_selector.scss index a6007a63620ed..fa7c58612cb2f 100644 --- a/x-pack/plugins/ml/public/datavisualizer/selector/_selector.scss +++ b/x-pack/plugins/ml/public/datavisualizer/selector/_selector.scss @@ -1,5 +1,5 @@ .ml-datavisualizer-selector { flex-grow: 1; - background-color: $euiColorLightestShade; + background-color: $euiPageBackgroundColor; min-height: 100vh; } diff --git a/x-pack/plugins/ml/public/file_datavisualizer/_file_datavisualizer.scss b/x-pack/plugins/ml/public/file_datavisualizer/_file_datavisualizer.scss index 64d64ce854304..119ebaeb4b228 100644 --- a/x-pack/plugins/ml/public/file_datavisualizer/_file_datavisualizer.scss +++ b/x-pack/plugins/ml/public/file_datavisualizer/_file_datavisualizer.scss @@ -2,6 +2,6 @@ .file-datavisualizer-container { padding: 20px; - background-color: $euiColorLightestShade; + background-color: $euiPageBackgroundColor; min-height: calc(100vh - 70px); } diff --git a/x-pack/plugins/ml/public/settings/_settings.scss b/x-pack/plugins/ml/public/settings/_settings.scss index 8659ea3ec2a0b..e529d32ba568e 100644 --- a/x-pack/plugins/ml/public/settings/_settings.scss +++ b/x-pack/plugins/ml/public/settings/_settings.scss @@ -1,7 +1,7 @@ .mlSettingsPage { .mlSettingsPage__body { - background: $euiColorLightestShade; + background: $euiPageBackgroundColor; min-height: 100vh; } diff --git a/x-pack/plugins/ml/public/settings/calendars/_calendars.scss b/x-pack/plugins/ml/public/settings/calendars/_calendars.scss index 9e60ec241b8e8..65116c266bbc2 100644 --- a/x-pack/plugins/ml/public/settings/calendars/_calendars.scss +++ b/x-pack/plugins/ml/public/settings/calendars/_calendars.scss @@ -1,4 +1,4 @@ .mlCalendarManagement { - background: $euiColorLightestShade; + background: $euiPageBackgroundColor; min-height: 100vh; } diff --git a/x-pack/plugins/ml/public/settings/filter_lists/_filter_lists.scss b/x-pack/plugins/ml/public/settings/filter_lists/_filter_lists.scss index 80dd1c495b092..a0d554a2d87d9 100644 --- a/x-pack/plugins/ml/public/settings/filter_lists/_filter_lists.scss +++ b/x-pack/plugins/ml/public/settings/filter_lists/_filter_lists.scss @@ -1,5 +1,5 @@ .ml-filter-lists { - background: $euiColorLightestShade; + background: $euiPageBackgroundColor; min-height: 100vh; } diff --git a/x-pack/plugins/monitoring/public/_hacks.scss b/x-pack/plugins/monitoring/public/_hacks.scss index d46d298f7aca5..bd5079a560820 100644 --- a/x-pack/plugins/monitoring/public/_hacks.scss +++ b/x-pack/plugins/monitoring/public/_hacks.scss @@ -1,12 +1,6 @@ @import '@elastic/eui/src/components/header/variables'; #monitoring-app { - // SASSTODO: We need background colors till more of Kibana is converted - monitoring-main { - background: $euiColorLightestShade; - height: calc(100vh - #{$euiHeaderChildSize}); - } - // SASSTODO: PUI tooltips can be replaced with EuiToolTip .pui-tooltip-inner { font-size: $euiFontSizeXS; diff --git a/x-pack/plugins/spaces/public/views/management/_manage_spaces.scss b/x-pack/plugins/spaces/public/views/management/_manage_spaces.scss index 1f58cd92a06e9..16953d4cadc74 100644 --- a/x-pack/plugins/spaces/public/views/management/_manage_spaces.scss +++ b/x-pack/plugins/spaces/public/views/management/_manage_spaces.scss @@ -1,5 +1,5 @@ #manageSpacesReactRoot { - background: $euiColorLightestShade; + background: $euiPageBackgroundColor; flex-grow: 1; } diff --git a/x-pack/plugins/upgrade_assistant/public/_app.scss b/x-pack/plugins/upgrade_assistant/public/_app.scss index 533bdfbea8c59..3097376fc8a4e 100644 --- a/x-pack/plugins/upgrade_assistant/public/_app.scss +++ b/x-pack/plugins/upgrade_assistant/public/_app.scss @@ -1,4 +1,4 @@ upgrade-assistant { flex-grow: 1; - background-color: $euiColorLightestShade; + background-color: $euiPageBackgroundColor; } diff --git a/x-pack/plugins/watcher/public/sections/watch_edit/components/threshold_watch_edit/_threshold_watch_edit.scss b/x-pack/plugins/watcher/public/sections/watch_edit/components/threshold_watch_edit/_threshold_watch_edit.scss index 18f18d33931cd..6f12d1d60679c 100644 --- a/x-pack/plugins/watcher/public/sections/watch_edit/components/threshold_watch_edit/_threshold_watch_edit.scss +++ b/x-pack/plugins/watcher/public/sections/watch_edit/components/threshold_watch_edit/_threshold_watch_edit.scss @@ -1,6 +1,6 @@ threshold-watch-edit { flex: 1 0 auto; - background-color: $euiColorLightestShade; + background-color: $euiPageBackgroundColor; .thresholdWatchEditButtons { flex-direction:row-reverse; From ce77669313827bf89b4fb29820729434e2a676e5 Mon Sep 17 00:00:00 2001 From: chorn Date: Tue, 5 Feb 2019 14:53:46 -0500 Subject: [PATCH 2/8] Hopefully fixing the last few plugins --- .../core_plugins/timelion/public/_app.scss | 4 +++- x-pack/plugins/apm/index.js | 1 + x-pack/plugins/apm/public/index.scss | 16 +++++++++++++++ .../plugins/apm/public/templates/index.html | 2 +- .../public/components/layouts/background.tsx | 1 - x-pack/plugins/infra/index.ts | 1 + x-pack/plugins/infra/public/index.scss | 20 +++++++++++++++++++ .../framework/kibana_framework_adapter.ts | 2 +- x-pack/plugins/ml/public/_hacks.scss | 9 +++++++++ .../datavisualizer/_datavisualizer.scss | 1 - 10 files changed, 52 insertions(+), 5 deletions(-) create mode 100644 x-pack/plugins/apm/public/index.scss create mode 100644 x-pack/plugins/infra/public/index.scss diff --git a/src/legacy/core_plugins/timelion/public/_app.scss b/src/legacy/core_plugins/timelion/public/_app.scss index e15b047cba3a1..ebc01d50c270a 100644 --- a/src/legacy/core_plugins/timelion/public/_app.scss +++ b/src/legacy/core_plugins/timelion/public/_app.scss @@ -1,7 +1,9 @@ - +@import '@elastic/eui/src/components/header/variables'; .timApp { position: relative; + min-height: calc(100vh - #{$euiHeaderChildSize}); + background: $euiColorEmptyShade; [ng-click] { cursor: pointer; diff --git a/x-pack/plugins/apm/index.js b/x-pack/plugins/apm/index.js index 3ac564dc20105..3b4fc770b576c 100644 --- a/x-pack/plugins/apm/index.js +++ b/x-pack/plugins/apm/index.js @@ -34,6 +34,7 @@ export function apm(kibana) { euiIconType: 'apmApp', order: 8100 }, + styleSheetPaths: resolve(__dirname, 'public/index.scss'), home: ['plugins/apm/register_feature'], injectDefaultVars(server) { const config = server.config(); diff --git a/x-pack/plugins/apm/public/index.scss b/x-pack/plugins/apm/public/index.scss new file mode 100644 index 0000000000000..5e6cd07906961 --- /dev/null +++ b/x-pack/plugins/apm/public/index.scss @@ -0,0 +1,16 @@ +// Import the EUI global scope so we can use EUI constants +@import 'ui/public/styles/_styling_constants'; + +/* Graph plugin styles */ + +// Prefix all styles with "apm" to avoid conflicts. +// Examples +// apmChart +// apmChart__legend +// apmChart__legend--small +// apmChart__legend-isLoading + +.apmReactRoot { + background-color: $euiColorEmptyShade; + overflow-x: auto; +} diff --git a/x-pack/plugins/apm/public/templates/index.html b/x-pack/plugins/apm/public/templates/index.html index b38dee3e344aa..d31c7363d6487 100644 --- a/x-pack/plugins/apm/public/templates/index.html +++ b/x-pack/plugins/apm/public/templates/index.html @@ -2,4 +2,4 @@ -
+
diff --git a/x-pack/plugins/beats_management/public/components/layouts/background.tsx b/x-pack/plugins/beats_management/public/components/layouts/background.tsx index 2763f25b0eb3e..49e2ac1af951f 100644 --- a/x-pack/plugins/beats_management/public/components/layouts/background.tsx +++ b/x-pack/plugins/beats_management/public/components/layouts/background.tsx @@ -9,5 +9,4 @@ import styled from 'styled-components'; export const Background = styled.div` flex-grow: 1; height: 100vh; - background: #f5f7fa; `; diff --git a/x-pack/plugins/infra/index.ts b/x-pack/plugins/infra/index.ts index b79d4c224126a..693342a6aacfb 100644 --- a/x-pack/plugins/infra/index.ts +++ b/x-pack/plugins/infra/index.ts @@ -37,6 +37,7 @@ export function infra(kibana: any) { listed: false, url: `/app/${APP_ID}#/home`, }, + styleSheetPaths: resolve(__dirname, 'public/index.scss'), home: ['plugins/infra/register_feature'], links: [ { diff --git a/x-pack/plugins/infra/public/index.scss b/x-pack/plugins/infra/public/index.scss new file mode 100644 index 0000000000000..a00de7237f8fd --- /dev/null +++ b/x-pack/plugins/infra/public/index.scss @@ -0,0 +1,20 @@ +// Import the EUI global scope so we can use EUI constants +@import 'ui/public/styles/_styling_constants'; + +/* Graph plugin styles */ + +// Prefix all styles with "inf" to avoid conflicts. +// Examples +// infChart +// infChart__legend +// infChart__legend--small +// infChart__legend-isLoading + +.infReactRoot { + background-color: $euiColorEmptyShade; + display: flex; + flex-direction: column; + align-items: stretch; + flex: 1 0 0%; + overflow: hidden; +} diff --git a/x-pack/plugins/infra/public/lib/adapters/framework/kibana_framework_adapter.ts b/x-pack/plugins/infra/public/lib/adapters/framework/kibana_framework_adapter.ts index 5d26268cf0500..169e9ccf73a19 100644 --- a/x-pack/plugins/infra/public/lib/adapters/framework/kibana_framework_adapter.ts +++ b/x-pack/plugins/infra/public/lib/adapters/framework/kibana_framework_adapter.ts @@ -118,7 +118,7 @@ export class InfraKibanaFrameworkAdapter implements InfraFrameworkAdapter { template: `
`, })); diff --git a/x-pack/plugins/ml/public/_hacks.scss b/x-pack/plugins/ml/public/_hacks.scss index c78730e06a697..a089d6d55eeed 100644 --- a/x-pack/plugins/ml/public/_hacks.scss +++ b/x-pack/plugins/ml/public/_hacks.scss @@ -1,3 +1,12 @@ +.tab-settings, +.tab-datavisualizer, +.tab-timeseriesexplorer, +.tab-explorer, +.tab-jobs { + // Make all page background white until More of the pages use EuiPage to wrap in panel-like components + background-color: $euiColorEmptyShade; +} + // These are hacks that were near ML's root. Unsure if they still need to be here. .tab-jobs, .edit-job-modal, diff --git a/x-pack/plugins/ml/public/datavisualizer/_datavisualizer.scss b/x-pack/plugins/ml/public/datavisualizer/_datavisualizer.scss index 9c6365b94cf40..410b875f47235 100644 --- a/x-pack/plugins/ml/public/datavisualizer/_datavisualizer.scss +++ b/x-pack/plugins/ml/public/datavisualizer/_datavisualizer.scss @@ -3,7 +3,6 @@ margin-right: auto; margin-left: auto; padding: $euiSizeS $euiSize; - background-color: $euiColorLightestShade; flex: 1 0 auto; .flexGroup__filler { From d630a2c79d488eb52fc6645e7f6c5dccd612f9af Mon Sep 17 00:00:00 2001 From: chorn Date: Tue, 5 Feb 2019 15:08:36 -0500 Subject: [PATCH 3/8] Update EUI to 6.9.0 --- package.json | 2 +- .../saved_objects_installer.test.js.snap | 64 +++++--- .../__snapshots__/new_vis_modal.test.tsx.snap | 138 ++++++++++-------- x-pack/package.json | 2 +- .../__test__/__snapshots__/List.test.tsx.snap | 8 +- .../__snapshots__/upload_license.test.js.snap | 69 +++++---- yarn.lock | 8 +- 7 files changed, 159 insertions(+), 132 deletions(-) diff --git a/package.json b/package.json index 567efe78aafe4..aae9b43b7d0d8 100644 --- a/package.json +++ b/package.json @@ -95,7 +95,7 @@ }, "dependencies": { "@elastic/datemath": "5.0.2", - "@elastic/eui": "6.8.0", + "@elastic/eui": "6.9.0", "@elastic/filesaver": "1.1.2", "@elastic/good": "8.1.1-kibana2", "@elastic/numeral": "2.3.2", diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/saved_objects_installer.test.js.snap b/src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/saved_objects_installer.test.js.snap index ca8a7a17541d0..4e7bd8a7e33d2 100644 --- a/src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/saved_objects_installer.test.js.snap +++ b/src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/saved_objects_installer.test.js.snap @@ -195,8 +195,13 @@ exports[`bulkCreate should display error message when bulkCreate request fails 1 - Incomplete - Step + + Incomplete Step + +   - Step + + Step + +   - - - - - - - + + + + + + - - - + + + + + +
@@ -1325,38 +1330,32 @@ exports[`NewVisModal should render as expected 1`] = ` } tabIndex={0} > - - - + + + + + +
diff --git a/x-pack/package.json b/x-pack/package.json index f7fe57f966e8e..d5113d108931e 100644 --- a/x-pack/package.json +++ b/x-pack/package.json @@ -120,7 +120,7 @@ }, "dependencies": { "@elastic/datemath": "5.0.2", - "@elastic/eui": "6.8.0", + "@elastic/eui": "6.9.0", "@elastic/node-crypto": "0.1.2", "@elastic/numeral": "2.3.2", "@kbn/babel-preset": "1.0.0", diff --git a/x-pack/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/__snapshots__/List.test.tsx.snap b/x-pack/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/__snapshots__/List.test.tsx.snap index 788450dbc2a85..21a6c5c296984 100644 --- a/x-pack/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/__snapshots__/List.test.tsx.snap +++ b/x-pack/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/__snapshots__/List.test.tsx.snap @@ -70,9 +70,7 @@ exports[`ErrorGroupOverview -> List should render empty state 1`] = ` className="euiScreenReaderOnly" role="status" > - Below is a table of - 0 - items. + Below is a table of 0 items. @@ -387,9 +385,7 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = ` className="euiScreenReaderOnly" role="status" > - Below is a table of - 4 - items. + Below is a table of 4 items. diff --git a/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.js.snap b/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.js.snap index 4274bb6cdac42..79085acb0b2f5 100644 --- a/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.js.snap +++ b/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.js.snap @@ -327,38 +327,32 @@ exports[`UploadLicense should display a modal when license requires acknowledgem onKeyDown={[Function]} tabIndex={0} > - - - + + + + + +
diff --git a/yarn.lock b/yarn.lock index 102d3fd149dcb..817a96812462b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -871,10 +871,10 @@ tabbable "^1.1.0" uuid "^3.1.0" -"@elastic/eui@6.8.0": - version "6.8.0" - resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-6.8.0.tgz#16152cb2b04ddc756bed5cadb525d27a8904ec42" - integrity sha512-AnBgIpcEzpKrdbqYRIitU0kPN0fTgO2olOSaQqoKz8LUQButYLE9+ghV6c48K12UuuMQUK7m+qvyXt2z/5xCGQ== +"@elastic/eui@6.9.0": + version "6.9.0" + resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-6.9.0.tgz#baada76820e8e5a7efccfd327234ef05ce105ee3" + integrity sha512-wvJY1hQsKukOIlhJihif7s0qvDb52xv+0nMS27UBqmiwSD4rLwomhlFaZ/DauesLbUvCd1wVl0CHW34uwA9RAQ== dependencies: "@types/lodash" "^4.14.116" "@types/numeral" "^0.0.25" From e980875f8f9527013b0ce14a3032caab8e864249 Mon Sep 17 00:00:00 2001 From: chorn Date: Tue, 5 Feb 2019 15:25:50 -0500 Subject: [PATCH 4/8] removing hacks --- src/legacy/core_plugins/console/public/_app.scss | 1 - .../core_plugins/kibana/public/dashboard/_hacks.scss | 8 -------- src/legacy/core_plugins/kibana/public/home/_home.scss | 4 ---- .../core_plugins/kibana/public/management/_hacks.scss | 1 - .../metrics/public/components/_vis_editor.scss | 1 - .../index_management/public/_index_management.scss | 5 ----- x-pack/plugins/maps/public/shared/components/_index.scss | 1 - .../maps/public/shared/components/_map_listing.scss | 5 ----- .../spaces/public/views/management/_manage_spaces.scss | 5 ----- x-pack/plugins/upgrade_assistant/public/_app.scss | 4 ---- x-pack/plugins/upgrade_assistant/public/index.scss | 1 - .../threshold_watch_edit/_threshold_watch_edit.scss | 3 --- 12 files changed, 39 deletions(-) delete mode 100644 x-pack/plugins/maps/public/shared/components/_map_listing.scss delete mode 100644 x-pack/plugins/upgrade_assistant/public/_app.scss diff --git a/src/legacy/core_plugins/console/public/_app.scss b/src/legacy/core_plugins/console/public/_app.scss index 54c84295c54b0..bf701379ab618 100644 --- a/src/legacy/core_plugins/console/public/_app.scss +++ b/src/legacy/core_plugins/console/public/_app.scss @@ -3,7 +3,6 @@ flex: 1 1 auto; position: relative; padding: $euiSizeS; - background-color: $euiPageBackgroundColor; // Make sure the editor actions don't create scrollbars on this container // SASSTODO: Uncomment when tooltips are EUI-ified (inside portals) // overflow: hidden; diff --git a/src/legacy/core_plugins/kibana/public/dashboard/_hacks.scss b/src/legacy/core_plugins/kibana/public/dashboard/_hacks.scss index bfa166b838d8e..474699d9cf25b 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/_hacks.scss +++ b/src/legacy/core_plugins/kibana/public/dashboard/_hacks.scss @@ -1,13 +1,5 @@ // ANGULAR SELECTOR HACKS -/** - * Mimics EuiPageBackground - */ -dashboard-listing { - background-color: $euiPageBackgroundColor; - min-height: 100vh; -} - /** * Needs to correspond with the react root nested inside angular. */ diff --git a/src/legacy/core_plugins/kibana/public/home/_home.scss b/src/legacy/core_plugins/kibana/public/home/_home.scss index 59f5446d826ef..bea3e45ff6d1c 100644 --- a/src/legacy/core_plugins/kibana/public/home/_home.scss +++ b/src/legacy/core_plugins/kibana/public/home/_home.scss @@ -1,7 +1,3 @@ -home-app { - background-color: $euiPageBackgroundColor; -} - .homPage { min-height: 100vh; max-width: 1200px; diff --git a/src/legacy/core_plugins/kibana/public/management/_hacks.scss b/src/legacy/core_plugins/kibana/public/management/_hacks.scss index 05861fa0044d0..96169b0449d53 100644 --- a/src/legacy/core_plugins/kibana/public/management/_hacks.scss +++ b/src/legacy/core_plugins/kibana/public/management/_hacks.scss @@ -12,7 +12,6 @@ kbn-management-objects-view { // SASSTODO: Remove when Kibana has a proper background color kbn-management-objects, kbn-management-app, .tab-management { - background: $euiPageBackgroundColor; flex-grow: 1; } diff --git a/src/legacy/core_plugins/metrics/public/components/_vis_editor.scss b/src/legacy/core_plugins/metrics/public/components/_vis_editor.scss index 7a0d3097426a9..308244c8af4b7 100644 --- a/src/legacy/core_plugins/metrics/public/components/_vis_editor.scss +++ b/src/legacy/core_plugins/metrics/public/components/_vis_editor.scss @@ -1,4 +1,3 @@ .tvbEditor { flex: 1; - background: $euiPageBackgroundColor; } diff --git a/x-pack/plugins/index_management/public/_index_management.scss b/x-pack/plugins/index_management/public/_index_management.scss index af299cb904066..abdd267038318 100644 --- a/x-pack/plugins/index_management/public/_index_management.scss +++ b/x-pack/plugins/index_management/public/_index_management.scss @@ -1,9 +1,4 @@ -#indReactRoot, #indexManagementReactRoot { - background-color: $euiPageBackgroundColor; -} - .indTable { - // The index table is a bespoke table and can't make use of EuiBasicTable's width settings thead th.indTable__header--name { width: 25%; diff --git a/x-pack/plugins/maps/public/shared/components/_index.scss b/x-pack/plugins/maps/public/shared/components/_index.scss index 4ddda7ea571a0..e69de29bb2d1d 100644 --- a/x-pack/plugins/maps/public/shared/components/_index.scss +++ b/x-pack/plugins/maps/public/shared/components/_index.scss @@ -1 +0,0 @@ -@import './map_listing'; diff --git a/x-pack/plugins/maps/public/shared/components/_map_listing.scss b/x-pack/plugins/maps/public/shared/components/_map_listing.scss deleted file mode 100644 index 8efaad3b57ded..0000000000000 --- a/x-pack/plugins/maps/public/shared/components/_map_listing.scss +++ /dev/null @@ -1,5 +0,0 @@ -// Makes sure the listing page is full height with proper background -map-listing, { - min-height: 100vh; - background-color: $euiPageBackgroundColor; -} diff --git a/x-pack/plugins/spaces/public/views/management/_manage_spaces.scss b/x-pack/plugins/spaces/public/views/management/_manage_spaces.scss index 16953d4cadc74..e6f5458c0d782 100644 --- a/x-pack/plugins/spaces/public/views/management/_manage_spaces.scss +++ b/x-pack/plugins/spaces/public/views/management/_manage_spaces.scss @@ -1,8 +1,3 @@ -#manageSpacesReactRoot { - background: $euiPageBackgroundColor; - flex-grow: 1; -} - .spcManagePage__content { max-width: 640px; margin-left: auto; diff --git a/x-pack/plugins/upgrade_assistant/public/_app.scss b/x-pack/plugins/upgrade_assistant/public/_app.scss deleted file mode 100644 index 3097376fc8a4e..0000000000000 --- a/x-pack/plugins/upgrade_assistant/public/_app.scss +++ /dev/null @@ -1,4 +0,0 @@ -upgrade-assistant { - flex-grow: 1; - background-color: $euiPageBackgroundColor; -} diff --git a/x-pack/plugins/upgrade_assistant/public/index.scss b/x-pack/plugins/upgrade_assistant/public/index.scss index d9ba9a436792a..7fc22c8d8f1f1 100644 --- a/x-pack/plugins/upgrade_assistant/public/index.scss +++ b/x-pack/plugins/upgrade_assistant/public/index.scss @@ -1,4 +1,3 @@ @import 'ui/public/styles/_styling_constants'; -@import './app'; @import './components/index'; diff --git a/x-pack/plugins/watcher/public/sections/watch_edit/components/threshold_watch_edit/_threshold_watch_edit.scss b/x-pack/plugins/watcher/public/sections/watch_edit/components/threshold_watch_edit/_threshold_watch_edit.scss index 6f12d1d60679c..b8a39a65c847f 100644 --- a/x-pack/plugins/watcher/public/sections/watch_edit/components/threshold_watch_edit/_threshold_watch_edit.scss +++ b/x-pack/plugins/watcher/public/sections/watch_edit/components/threshold_watch_edit/_threshold_watch_edit.scss @@ -1,7 +1,4 @@ threshold-watch-edit { - flex: 1 0 auto; - background-color: $euiPageBackgroundColor; - .thresholdWatchEditButtons { flex-direction:row-reverse; } From 5b7d94e808ff495130210b911515f3079e9538a2 Mon Sep 17 00:00:00 2001 From: chorn Date: Tue, 5 Feb 2019 15:47:02 -0500 Subject: [PATCH 5/8] last fixes --- src/legacy/core_plugins/kibana/public/management/_hacks.scss | 5 ----- x-pack/plugins/apm/public/templates/index.html | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/legacy/core_plugins/kibana/public/management/_hacks.scss b/src/legacy/core_plugins/kibana/public/management/_hacks.scss index 96169b0449d53..b2ffca9ef964a 100644 --- a/src/legacy/core_plugins/kibana/public/management/_hacks.scss +++ b/src/legacy/core_plugins/kibana/public/management/_hacks.scss @@ -10,11 +10,6 @@ kbn-management-objects-view { display: block; } -// SASSTODO: Remove when Kibana has a proper background color -kbn-management-objects, kbn-management-app, .tab-management { - flex-grow: 1; -} - #management-landing { display: flex; } diff --git a/x-pack/plugins/apm/public/templates/index.html b/x-pack/plugins/apm/public/templates/index.html index d31c7363d6487..e1345cc1a9254 100644 --- a/x-pack/plugins/apm/public/templates/index.html +++ b/x-pack/plugins/apm/public/templates/index.html @@ -2,4 +2,4 @@
-
+
From d81c9950295d91d4b6dc39a186c8278adc6a11a0 Mon Sep 17 00:00:00 2001 From: chorn Date: Tue, 5 Feb 2019 16:26:01 -0500 Subject: [PATCH 6/8] Remove a few more `100vh` --- src/legacy/core_plugins/kibana/public/home/_home.scss | 1 - src/legacy/core_plugins/status_page/public/index.scss | 5 ----- .../public/components/layouts/background.tsx | 1 - 3 files changed, 7 deletions(-) diff --git a/src/legacy/core_plugins/kibana/public/home/_home.scss b/src/legacy/core_plugins/kibana/public/home/_home.scss index bea3e45ff6d1c..0d1ecc7aac4be 100644 --- a/src/legacy/core_plugins/kibana/public/home/_home.scss +++ b/src/legacy/core_plugins/kibana/public/home/_home.scss @@ -1,5 +1,4 @@ .homPage { - min-height: 100vh; max-width: 1200px; margin: auto; } diff --git a/src/legacy/core_plugins/status_page/public/index.scss b/src/legacy/core_plugins/status_page/public/index.scss index 85c5bf15f3161..f23b50992ac21 100644 --- a/src/legacy/core_plugins/status_page/public/index.scss +++ b/src/legacy/core_plugins/status_page/public/index.scss @@ -1,6 +1 @@ @import 'ui/public/styles/styling_constants'; - -// SASSTODO: Remove when K7 applies background color to body -#status_page-app .stsPage { - min-height: 100vh; -} \ No newline at end of file diff --git a/x-pack/plugins/beats_management/public/components/layouts/background.tsx b/x-pack/plugins/beats_management/public/components/layouts/background.tsx index 49e2ac1af951f..a8eeda1f6571b 100644 --- a/x-pack/plugins/beats_management/public/components/layouts/background.tsx +++ b/x-pack/plugins/beats_management/public/components/layouts/background.tsx @@ -8,5 +8,4 @@ import styled from 'styled-components'; export const Background = styled.div` flex-grow: 1; - height: 100vh; `; From 7446729eec302207dd8566916fc4637ad453fddf Mon Sep 17 00:00:00 2001 From: chorn Date: Tue, 5 Feb 2019 16:58:04 -0500 Subject: [PATCH 7/8] Can I remember to copy & REPLACE --- x-pack/plugins/apm/public/index.scss | 2 +- x-pack/plugins/infra/public/index.scss | 2 +- x-pack/plugins/spaces/public/index.scss | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/x-pack/plugins/apm/public/index.scss b/x-pack/plugins/apm/public/index.scss index 5e6cd07906961..f4b4d0d3a27dc 100644 --- a/x-pack/plugins/apm/public/index.scss +++ b/x-pack/plugins/apm/public/index.scss @@ -1,7 +1,7 @@ // Import the EUI global scope so we can use EUI constants @import 'ui/public/styles/_styling_constants'; -/* Graph plugin styles */ +/* APM plugin styles */ // Prefix all styles with "apm" to avoid conflicts. // Examples diff --git a/x-pack/plugins/infra/public/index.scss b/x-pack/plugins/infra/public/index.scss index a00de7237f8fd..51529d16f6126 100644 --- a/x-pack/plugins/infra/public/index.scss +++ b/x-pack/plugins/infra/public/index.scss @@ -1,7 +1,7 @@ // Import the EUI global scope so we can use EUI constants @import 'ui/public/styles/_styling_constants'; -/* Graph plugin styles */ +/* Infra plugin styles */ // Prefix all styles with "inf" to avoid conflicts. // Examples diff --git a/x-pack/plugins/spaces/public/index.scss b/x-pack/plugins/spaces/public/index.scss index eabd311fac142..5c2b370a51764 100644 --- a/x-pack/plugins/spaces/public/index.scss +++ b/x-pack/plugins/spaces/public/index.scss @@ -1,7 +1,7 @@ // Import the EUI global scope so we can use EUI constants @import 'ui/public/styles/_styling_constants'; -/* Graph plugin styles */ +/* Spaces plugin styles */ // Prefix all styles with "spc" to avoid conflicts. // Examples From 2b0bed4f2195e24fb9ff00aba23428caa070de40 Mon Sep 17 00:00:00 2001 From: chorn Date: Tue, 5 Feb 2019 19:46:24 -0500 Subject: [PATCH 8/8] EUI at 6.10.0 --- package.json | 2 +- .../ui/__snapshots__/inspector_panel.test.js.snap | 1 + x-pack/package.json | 2 +- .../__snapshots__/extend_index_management.test.js.snap | 1 + .../__jest__/__snapshots__/telemetry_opt_in.test.js.snap | 1 + yarn.lock | 8 ++++---- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index aae9b43b7d0d8..68342b92af3b9 100644 --- a/package.json +++ b/package.json @@ -95,7 +95,7 @@ }, "dependencies": { "@elastic/datemath": "5.0.2", - "@elastic/eui": "6.9.0", + "@elastic/eui": "6.10.0", "@elastic/filesaver": "1.1.2", "@elastic/good": "8.1.1-kibana2", "@elastic/numeral": "2.3.2", diff --git a/src/ui/public/inspector/ui/__snapshots__/inspector_panel.test.js.snap b/src/ui/public/inspector/ui/__snapshots__/inspector_panel.test.js.snap index dcec7df4e239a..589f506b53fdc 100644 --- a/src/ui/public/inspector/ui/__snapshots__/inspector_panel.test.js.snap +++ b/src/ui/public/inspector/ui/__snapshots__/inspector_panel.test.js.snap @@ -243,6 +243,7 @@ exports[`InspectorPanel should render as expected 1`] = ` repositionOnScroll={true} >