From c09b09891b64f0c6abb6a053bc6743270bb5d54c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20St=C3=BCrmer?= Date: Wed, 12 Dec 2018 13:22:13 +0100 Subject: [PATCH] [Infra UI] Fix styling after breaking EUI changes (#27021) This restores the Infrastructure and Logs UIs after upstream changes: * The theme json import now behaves like a ES6 module. * The `` now requires the `grow` prop to be `true` in order to grow horizontally. --- x-pack/plugins/infra/public/apps/start_app.tsx | 2 +- x-pack/plugins/infra/public/components/header/legacy_header.tsx | 2 +- x-pack/plugins/infra/types/eui.d.ts | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/x-pack/plugins/infra/public/apps/start_app.tsx b/x-pack/plugins/infra/public/apps/start_app.tsx index 7256f7ddd49e6..3ef74b66df874 100644 --- a/x-pack/plugins/infra/public/apps/start_app.tsx +++ b/x-pack/plugins/infra/public/apps/start_app.tsx @@ -15,7 +15,7 @@ import { ThemeProvider } from 'styled-components'; // TODO use theme provided from parentApp when kibana supports it import { EuiErrorBoundary } from '@elastic/eui'; -import * as euiVars from '@elastic/eui/dist/eui_theme_k6_light.json'; +import euiVars from '@elastic/eui/dist/eui_theme_k6_light.json'; import { I18nProvider } from '@kbn/i18n/react'; import { InfraFrontendLibs } from '../lib/lib'; import { PageRouter } from '../routes'; diff --git a/x-pack/plugins/infra/public/components/header/legacy_header.tsx b/x-pack/plugins/infra/public/components/header/legacy_header.tsx index 3dd4872b09c46..6d39eb883d8e0 100644 --- a/x-pack/plugins/infra/public/components/header/legacy_header.tsx +++ b/x-pack/plugins/infra/public/components/header/legacy_header.tsx @@ -20,7 +20,7 @@ export const LegacyHeader: React.SFC = ({ breadcrumbs = [], }) => ( - + {appendSections} diff --git a/x-pack/plugins/infra/types/eui.d.ts b/x-pack/plugins/infra/types/eui.d.ts index be3d2f0b068ab..a05e6e19671a1 100644 --- a/x-pack/plugins/infra/types/eui.d.ts +++ b/x-pack/plugins/infra/types/eui.d.ts @@ -39,6 +39,7 @@ declare module '@elastic/eui' { export type EuiHeaderSectionSide = 'left' | 'right'; type EuiHeaderSectionProps = CommonProps & { side?: EuiHeaderSectionSide; + grow?: boolean; }; export const EuiHeaderSection: React.SFC;