Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const cssProp = css`

grid-template-areas:
'banner banner banner'
'navigation header sidebar'
'header header header'
'navigation application sidebar'
'footer footer footer';
`;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,11 @@ export const LayoutGlobalCSS = () => {
`;

const header = css`
${layoutVarName('header.top')}: ${layoutVar('banner.height')};
${layoutVarName('header.left')}: ${navigationWidth}px;
${layoutVarName('header.right')}: ${sidebarWidth}px;
${layoutVarName('header.top')}: ${bannerHeight}px;
${layoutVarName('header.left')}: 0;
${layoutVarName('header.right')}: 0;
${layoutVarName('header.height')}: ${headerHeight}px;
${layoutVarName('header.width')}: calc(
100vw - ${layoutVar('header.left')} - ${layoutVar('header.right')}
);
${layoutVarName('header.width')}: 100vw;
${layoutVarName('header.bottom')}: calc(
100vh - ${layoutVar('banner.height')} + ${layoutVar('header.height')}
);
Expand All @@ -60,7 +58,7 @@ export const LayoutGlobalCSS = () => {
`;

const navigation = css`
${layoutVarName('navigation.top')}: ${layoutVar('banner.height')};
${layoutVarName('navigation.top')}: ${bannerHeight + headerHeight}px;
${layoutVarName('navigation.bottom')}: ${layoutVar('footer.height')};
${layoutVarName('navigation.left')}: 0;
${layoutVarName('navigation.right')}: calc(100vw - ${navigationWidth}px);
Expand All @@ -71,7 +69,7 @@ export const LayoutGlobalCSS = () => {
`;

const sidebar = css`
${layoutVarName('sidebar.top')}: ${layoutVar('banner.height')};
${layoutVarName('sidebar.top')}: ${bannerHeight + headerHeight}px;
${layoutVarName('sidebar.bottom')}: ${layoutVar('footer.height')};
${layoutVarName('sidebar.right')}: 0;
${layoutVarName('sidebar.left')}: calc(100vw - ${sidebarWidth}px);
Expand All @@ -82,9 +80,7 @@ export const LayoutGlobalCSS = () => {
`;

const application = css`
${layoutVarName('application.top')}: calc(
${layoutVar('banner.height')} + ${layoutVar('header.height')}
);
${layoutVarName('application.top')}: ${bannerHeight + headerHeight}px;
${layoutVarName('application.bottom')}: ${layoutVar('footer.height')};
${layoutVarName('application.left')}: ${navigationWidth}px;
${layoutVarName('application.right')}: ${sidebarWidth}px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,8 @@ import { layoutVar, layoutLevels } from '@kbn/core-chrome-layout-constants';
import type { EmotionFn } from '../types';

const root: EmotionFn = ({ euiTheme }) => css`
position: sticky;
grid-area: navigation;
align-self: start;
height: 100%;
height: ${layoutVar('navigation.height')};
width: ${layoutVar('navigation.width')};
z-index: ${layoutLevels.navigation};
display: flex;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
}

// open Infrastructure popover and navigate to some link inside the panel
await solutionNavigation.sidenav.expandMore();
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We removed this in the original grid PR because there was more space in the sidenav so we didn't need to click "more" here.
Now we need to revert this

https://github.com/elastic/kibana/pull/243181/files#r2546679194

await solutionNavigation.sidenav.clickLink({ navId: 'metrics' });
// open first link in popover to open a panel
await solutionNavigation.sidenav.clickLink({ navId: 'metrics:inventory' });
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
const pageObjects = getPageObjects(['svlCommonPage', 'svlCommonNavigation', 'header']);

const openInfraSection = async () => {
await pageObjects.svlCommonNavigation.sidenav.expandMore();
await pageObjects.svlCommonNavigation.sidenav.openPanel('metrics');
};

Expand Down