[UX] Consolidate menu bars

Signed-off-by: Josh Romero <[email protected]>
opensearch-project · May 17, 2022 · d2a2e09 · d2a2e09
1 parent 1792662
commit d2a2e09
Show file tree

Hide file tree

Showing 9 changed files with 1,068 additions and 2,167 deletions.
diff --git a/src/core/public/_variables.scss b/src/core/public/_variables.scss
@@ -1,3 +1,3 @@
 @import "@elastic/eui/src/global_styling/variables/header";
 
-$osdHeaderOffset: $euiHeaderHeightCompensation * 2;
+$osdHeaderOffset: $euiHeaderHeightCompensation;
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
diff --git a/...c/chrome/ui/header/branding/__snapshots__/opensearch_dashboards_custom_logo.test.tsx.snap b/...c/chrome/ui/header/branding/__snapshots__/opensearch_dashboards_custom_logo.test.tsx.snap
diff --git a/...pensearch_dashboards_custom_logo.test.tsx → ...c/chrome/ui/header/branding/mark.test.tsx b/...pensearch_dashboards_custom_logo.test.tsx → ...c/chrome/ui/header/branding/mark.test.tsx
@@ -5,7 +5,7 @@
 
 import React from 'react';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
-import { CustomLogo } from './opensearch_dashboards_custom_logo';
+import { Mark } from './mark';
 
 describe('Header logo ', () => {
   describe('in default mode ', () => {
@@ -16,7 +16,7 @@ describe('Header logo ', () => {
         mark: {},
         applicationTitle: 'custom title',
       };
-      const component = mountWithIntl(<CustomLogo {...branding} />);
+      const component = mountWithIntl(<Mark {...branding} />);
       expect(component).toMatchSnapshot();
     });
 
@@ -27,7 +27,7 @@ describe('Header logo ', () => {
         mark: { defaultUrl: '/defaultModeMark' },
         applicationTitle: 'custom title',
       };
-      const component = mountWithIntl(<CustomLogo {...branding} />);
+      const component = mountWithIntl(<Mark {...branding} />);
       expect(component).toMatchSnapshot();
     });
 
@@ -38,7 +38,7 @@ describe('Header logo ', () => {
         mark: {},
         applicationTitle: 'custom title',
       };
-      const component = mountWithIntl(<CustomLogo {...branding} />);
+      const component = mountWithIntl(<Mark {...branding} />);
       expect(component).toMatchSnapshot();
     });
   });
@@ -51,7 +51,7 @@ describe('Header logo ', () => {
         mark: { defaultUrl: '/defaultModeMark', darkModeUrl: '/darkModeMark' },
         applicationTitle: 'custom title',
       };
-      const component = mountWithIntl(<CustomLogo {...branding} />);
+      const component = mountWithIntl(<Mark {...branding} />);
       expect(component).toMatchSnapshot();
     });
 
@@ -62,7 +62,7 @@ describe('Header logo ', () => {
         mark: { defaultUrl: '/defaultModeMark', darkModeUrl: '/darkModeMark' },
         applicationTitle: 'custom title',
       };
-      const component = mountWithIntl(<CustomLogo {...branding} />);
+      const component = mountWithIntl(<Mark {...branding} />);
       expect(component).toMatchSnapshot();
     });
 
@@ -73,7 +73,7 @@ describe('Header logo ', () => {
         mark: { defaultUrl: '/defaultModeMark', darkModeUrl: '/darkModeMark' },
         applicationTitle: 'custom title',
       };
-      const component = mountWithIntl(<CustomLogo {...branding} />);
+      const component = mountWithIntl(<Mark {...branding} />);
       expect(component).toMatchSnapshot();
     });
 
@@ -84,7 +84,7 @@ describe('Header logo ', () => {
         mark: { defaultUrl: '/defaultModeMark' },
         applicationTitle: 'custom title',
       };
-      const component = mountWithIntl(<CustomLogo {...branding} />);
+      const component = mountWithIntl(<Mark {...branding} />);
       expect(component).toMatchSnapshot();
     });
 
@@ -95,7 +95,7 @@ describe('Header logo ', () => {
         mark: {},
         applicationTitle: 'custom title',
       };
-      const component = mountWithIntl(<CustomLogo {...branding} />);
+      const component = mountWithIntl(<Mark {...branding} />);
       expect(component).toMatchSnapshot();
     });
   });