diff --git a/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap index b885bad1a90f..9cef3e2d9aea 100644 --- a/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap +++ b/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap @@ -2920,7 +2920,7 @@ exports[`Header renders 1`] = ` aria-label="Go to home page" data-test-subj="logo" href="/" - iconType="heatmap" + iconType={[Function]} onClick={[Function]} >
- - OpenSearch Dashboards - diff --git a/src/core/public/chrome/ui/header/branding/opensearch_dashboards_logo_darkmode.tsx b/src/core/public/chrome/ui/header/branding/opensearch_dashboards_logo_darkmode.tsx new file mode 100644 index 000000000000..665c8615738e --- /dev/null +++ b/src/core/public/chrome/ui/header/branding/opensearch_dashboards_logo_darkmode.tsx @@ -0,0 +1,103 @@ +/* + * SPDX-License-Identifier: Apache-2.0 + * + * The OpenSearch Contributors require contributions made to + * this file be licensed under the Apache-2.0 license or a + * compatible open source license. + */ + +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +/* + * Modifications Copyright OpenSearch Contributors. See + * GitHub history for details. + */ +import React from 'react'; + +export function OpenSearchDashboardsLogoDarkMode() { + return ( + + + + + + + + + + + + + + + + + + ); +} diff --git a/src/core/public/chrome/ui/header/header_logo.tsx b/src/core/public/chrome/ui/header/header_logo.tsx index d1bc2aa37f8c..36262fb3e317 100644 --- a/src/core/public/chrome/ui/header/header_logo.tsx +++ b/src/core/public/chrome/ui/header/header_logo.tsx @@ -37,6 +37,7 @@ import useObservable from 'react-use/lib/useObservable'; import { Observable } from 'rxjs'; import Url from 'url'; import { ChromeNavLink } from '../..'; +import { OpenSearchDashboardsLogoDarkMode } from './branding/opensearch_dashboards_logo_darkmode'; function findClosestAnchor(element: HTMLElement): HTMLAnchorElement | void { let current = element; @@ -112,14 +113,12 @@ export function HeaderLogo({ href, navigateToApp, ...observables }: Props) { return ( onClick(e, forceNavigation, navLinks, navigateToApp)} href={href} aria-label={i18n.translate('core.ui.chrome.headerGlobalNav.goHomePageIconAriaLabel', { defaultMessage: 'Go to home page', })} - > - OpenSearch Dashboards - + /> ); } diff --git a/src/core/public/core_app/styles/_mixins.scss b/src/core/public/core_app/styles/_mixins.scss index e437fa9d7872..6982f1f9b015 100644 --- a/src/core/public/core_app/styles/_mixins.scss +++ b/src/core/public/core_app/styles/_mixins.scss @@ -16,7 +16,7 @@ text-align: center; background-color: $euiColorEmptyShade; border-radius: 100%; - padding: $euiSize; + padding: $euiSize / 2; .euiIcon { vertical-align: baseline; diff --git a/src/core/server/rendering/views/template.tsx b/src/core/server/rendering/views/template.tsx index 3cffe8f5c180..26b271ceeea8 100644 --- a/src/core/server/rendering/views/template.tsx +++ b/src/core/server/rendering/views/template.tsx @@ -51,34 +51,20 @@ export const Template: FunctionComponent = ({ strictCsp, }, }) => { - const logo = ( - - - - - - - - - + const openSearchLogo = ( + + + + ); return ( @@ -137,7 +123,7 @@ export const Template: FunctionComponent = ({ data-test-subj="osdLoadingMessage" >
- {logo} + {openSearchLogo}
= ({
- {logo} + {openSearchLogo}

{i18n('core.ui.legacyBrowserTitle', { diff --git a/src/plugins/dev_tools/public/plugin.ts b/src/plugins/dev_tools/public/plugin.ts index 2b508a32b887..b27f74f63943 100644 --- a/src/plugins/dev_tools/public/plugin.ts +++ b/src/plugins/dev_tools/public/plugin.ts @@ -73,7 +73,7 @@ export class DevToolsPlugin implements Plugin { defaultMessage: 'Dev Tools', }), updater$: this.appStateUpdater, - euiIconType: 'heatmap', + euiIconType: '/plugins/home/assets/logos/opensearch_mark_default.svg', order: 9010, category: DEFAULT_APP_CATEGORIES.management, mount: async (params: AppMountParameters) => { diff --git a/src/plugins/home/public/application/components/__snapshots__/welcome.test.tsx.snap b/src/plugins/home/public/application/components/__snapshots__/welcome.test.tsx.snap index 1ec9e01a327e..b52becae745a 100644 --- a/src/plugins/home/public/application/components/__snapshots__/welcome.test.tsx.snap +++ b/src/plugins/home/public/application/components/__snapshots__/welcome.test.tsx.snap @@ -18,8 +18,8 @@ exports[`should render a Welcome screen with no telemetry disclaimer 1`] = ` className="homWelcome__logo" > void; @@ -148,7 +149,7 @@ export class Welcome extends React.Component {
- +

diff --git a/src/plugins/home/public/assets/logos/opensearch_mark_centered.svg b/src/plugins/home/public/assets/logos/opensearch_mark_centered.svg new file mode 100644 index 000000000000..649f8e3a5c90 --- /dev/null +++ b/src/plugins/home/public/assets/logos/opensearch_mark_centered.svg @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/src/plugins/home/public/assets/logos/opensearch_mark_darkmode.svg b/src/plugins/home/public/assets/logos/opensearch_mark_darkmode.svg new file mode 100644 index 000000000000..ad8c2606f5bf --- /dev/null +++ b/src/plugins/home/public/assets/logos/opensearch_mark_darkmode.svg @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/src/plugins/home/public/assets/logos/opensearch_mark_default.svg b/src/plugins/home/public/assets/logos/opensearch_mark_default.svg new file mode 100644 index 000000000000..e185d0fc8c3b --- /dev/null +++ b/src/plugins/home/public/assets/logos/opensearch_mark_default.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/plugins/home/server/index.ts b/src/plugins/home/server/index.ts index b3c05bd1b687..48cbbb23e97c 100644 --- a/src/plugins/home/server/index.ts +++ b/src/plugins/home/server/index.ts @@ -39,7 +39,7 @@ import { configSchema, ConfigSchema } from '../config'; export const config: PluginConfigDescriptor = { exposeToBrowser: { - disableWelcomeScreen: true, + disableWelcomeScreen: false, }, schema: configSchema, deprecations: ({ renameFromRoot }) => [ diff --git a/src/plugins/home/server/tutorials/opensearch_logs/index.ts b/src/plugins/home/server/tutorials/opensearch_logs/index.ts index fc0a7445259a..90120cae2c6d 100644 --- a/src/plugins/home/server/tutorials/opensearch_logs/index.ts +++ b/src/plugins/home/server/tutorials/opensearch_logs/index.ts @@ -60,7 +60,7 @@ export function opensearchLogsSpecProvider(context: TutorialContext): TutorialSc learnMoreLink: '{config.docs.beats.filebeat}/filebeat-module-opensearch.html', }, }), - euiIconType: 'heatmap', + euiIconType: '/plugins/home/assets/logos/opensearch_mark_default.svg', artifacts: { application: { label: i18n.translate('home.tutorials.opensearchLogs.artifacts.application.label', { diff --git a/src/plugins/home/server/tutorials/opensearch_metrics/index.ts b/src/plugins/home/server/tutorials/opensearch_metrics/index.ts index 05cadda50554..92aa95640168 100644 --- a/src/plugins/home/server/tutorials/opensearch_metrics/index.ts +++ b/src/plugins/home/server/tutorials/opensearch_metrics/index.ts @@ -59,7 +59,7 @@ export function opensearchMetricsSpecProvider(context: TutorialContext): Tutoria learnMoreLink: '{config.docs.beats.metricbeat}/metricbeat-module-opensearch.html', }, }), - euiIconType: 'heatmap', + euiIconType: '/plugins/home/assets/logos/opensearch_mark_default.svg', artifacts: { application: { label: i18n.translate('home.tutorials.opensearchMetrics.artifacts.application.label', { diff --git a/src/plugins/management/public/plugin.ts b/src/plugins/management/public/plugin.ts index 085c7fc00e3d..7e947edd94b2 100644 --- a/src/plugins/management/public/plugin.ts +++ b/src/plugins/management/public/plugin.ts @@ -91,7 +91,7 @@ export class ManagementPlugin implements Plugin
diff --git a/src/plugins/opensearch_dashboards_react/public/exit_full_screen_button/exit_full_screen_button.tsx b/src/plugins/opensearch_dashboards_react/public/exit_full_screen_button/exit_full_screen_button.tsx index aba0679061f9..c88087908144 100644 --- a/src/plugins/opensearch_dashboards_react/public/exit_full_screen_button/exit_full_screen_button.tsx +++ b/src/plugins/opensearch_dashboards_react/public/exit_full_screen_button/exit_full_screen_button.tsx @@ -40,6 +40,8 @@ export interface ExitFullScreenButtonProps { } import './index.scss'; +// eslint-disable-next-line @osd/eslint/no-restricted-paths +import OpenSearchMarkDarkMode from '../../../home/public/assets/logos/opensearch_mark_darkmode.svg'; class ExitFullScreenButtonUi extends PureComponent { public onKeyDown = (e: KeyboardEvent) => { @@ -83,7 +85,7 @@ class ExitFullScreenButtonUi extends PureComponent { > - +