From 7f8ddaf827eb78bb0e1f6b77c10cc0c09039fcc1 Mon Sep 17 00:00:00 2001 From: Michael Marcialis Date: Thu, 3 Sep 2020 12:19:37 -0400 Subject: [PATCH 1/7] clean up header styles; match obs header better --- .../public/application/components/home.js | 8 ++- .../public/components/overview/overview.tsx | 33 ++--------- .../public/components/page_header.tsx | 59 ++++++++++++------- 3 files changed, 48 insertions(+), 52 deletions(-) diff --git a/src/plugins/home/public/application/components/home.js b/src/plugins/home/public/application/components/home.js index 8b6b83f097fd6..d0bb7c1049ccc 100644 --- a/src/plugins/home/public/application/components/home.js +++ b/src/plugins/home/public/application/components/home.js @@ -155,7 +155,7 @@ export class Home extends Component { - + {i18n.translate('home.pageHeader.addDataButtonLabel', { defaultMessage: 'Add data', })} @@ -165,8 +165,9 @@ export class Home extends Component { {stackManagement ? ( {i18n.translate('home.pageHeader.stackManagementButtonLabel', { defaultMessage: 'Manage', @@ -178,8 +179,9 @@ export class Home extends Component { {devTools ? ( {i18n.translate('home.pageHeader.devToolsButtonLabel', { defaultMessage: 'Dev tools', diff --git a/src/plugins/kibana_overview/public/components/overview/overview.tsx b/src/plugins/kibana_overview/public/components/overview/overview.tsx index e4997b0e6b6f5..69428e0a6d269 100644 --- a/src/plugins/kibana_overview/public/components/overview/overview.tsx +++ b/src/plugins/kibana_overview/public/components/overview/overview.tsx @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + import React, { FC, useState, useEffect } from 'react'; import { Observable } from 'rxjs'; import { @@ -296,35 +297,9 @@ export const Overview: FC = ({ newsfeed$ }) => { }; return ( -
-
-
- - - - - - - Visualize & analyze - - - -

- -

- - } - /> -
-
-
-
-
+
+ +
diff --git a/src/plugins/kibana_overview/public/components/page_header.tsx b/src/plugins/kibana_overview/public/components/page_header.tsx index ebdee62729578..d0fc8773b3ecb 100644 --- a/src/plugins/kibana_overview/public/components/page_header.tsx +++ b/src/plugins/kibana_overview/public/components/page_header.tsx @@ -17,38 +17,55 @@ * under the License. */ -import React, { FC } from 'react'; -import { EuiFlexGroup, EuiFlexItem, EuiButtonEmpty } from '@elastic/eui'; +import React from 'react'; +import { EuiButtonEmpty, EuiFlexGroup, EuiFlexItem, EuiIcon, EuiTitle } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; +import { FormattedMessage } from '@kbn/i18n/react'; import { createAppNavigationHandler } from '../app_navigation_handler'; -interface Props { - title: JSX.Element; -} - -export const PageHeader: FC = ({ title }) => { +export const PageHeader = () => { const devTools = { path: '/app/dev_tools#/console' }; const stackManagement = { path: '/app/management' }; return ( -
-
- - {title} +
+
+ + + + + + + + + +

+ +

+
+
+
+
+ - - - + + + {i18n.translate('home.pageHeader.addDataButtonLabel', { defaultMessage: 'Add data', })} + {stackManagement ? ( - + {i18n.translate('home.pageHeader.stackManagementButtonLabel', { defaultMessage: 'Manage', @@ -56,11 +73,13 @@ export const PageHeader: FC = ({ title }) => { ) : null} + {devTools ? ( - + {i18n.translate('home.pageHeader.devToolsButtonLabel', { defaultMessage: 'Dev tools', @@ -71,7 +90,7 @@ export const PageHeader: FC = ({ title }) => { -
-
+
+ ); }; From 47171900402bc2f5d6ed5d6f0615f8752de01110 Mon Sep 17 00:00:00 2001 From: Michael Marcialis Date: Thu, 3 Sep 2020 12:29:52 -0400 Subject: [PATCH 2/7] clean up footer styles --- .../home/public/application/components/home.js | 1 + .../public/components/_overview.scss | 11 +---------- .../public/components/overview/overview.tsx | 15 +++++---------- 3 files changed, 7 insertions(+), 20 deletions(-) diff --git a/src/plugins/home/public/application/components/home.js b/src/plugins/home/public/application/components/home.js index d0bb7c1049ccc..5898ce4a6944e 100644 --- a/src/plugins/home/public/application/components/home.js +++ b/src/plugins/home/public/application/components/home.js @@ -221,6 +221,7 @@ export class Home extends Component { {advancedSettings && ( * { - margin-bottom: 0 !important; - margin-top: 0 !important; - } -} diff --git a/src/plugins/kibana_overview/public/components/overview/overview.tsx b/src/plugins/kibana_overview/public/components/overview/overview.tsx index 69428e0a6d269..5d3bb8a971007 100644 --- a/src/plugins/kibana_overview/public/components/overview/overview.tsx +++ b/src/plugins/kibana_overview/public/components/overview/overview.tsx @@ -301,21 +301,15 @@ export const Overview: FC = ({ newsfeed$ }) => {
- - {isNewKibanaInstance ? renderGettingStarted() : renderNormal()} -